Changeset: 8eb46a0a24c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8eb46a0a24c8
Modified Files:
        .hgtags
        MonetDB.spec
        debian/changelog
        libversions
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (57 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -677,3 +677,6 @@ e6552cdd3180bcd35f959954807cab986a6042a5
 e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_3
 1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
+269ab71a82190d6024b3a920837089d657893493 Jul2017_5
+1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
+269ab71a82190d6024b3a920837089d657893493 Jul2017_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1039,6 +1039,10 @@ done
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jul 27 2017 Sjoerd Mullender <[email protected]> - 11.27.5-20170727
+- Rebuilt.
+- BZ#6375: MAL profiler truncates JSON objects larger than 8192 characters
+
 * Tue Jul 25 2017 Sjoerd Mullender <[email protected]> - 11.27.3-20170725
 - Rebuilt.
 - BZ#6325: Merge table unusable in other connections
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.27.5) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6375: MAL profiler truncates JSON objects larger than 8192 characters
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 27 Jul 2017 12:56:09 +0200
+
 monetdb (11.27.3) unstable; urgency=low
 
   * Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=15:1:0
+GDK_VERSION=15:2:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=9:1:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=23:1:0
+MONETDB5_VERSION=23:2:0
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=10:1:2
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to