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

Merge with Oct2014 branch.


diffs (64 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -593,3 +593,6 @@ 0529873485e7ec8e4c723f8bf7fc14020a7390b2
 f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release
 027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_13
 027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release
+a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_15
+027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release
+a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -970,6 +970,13 @@ mv %{buildroot}%{_datadir}/doc/MonetDB-S
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jun 03 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.15-20150603
+- Rebuilt.
+- BZ#3707: var() possibly not working in debug builds
+- BZ#3720: Incorrect results on joining with same table
+- BZ#3725: LEFT JOIN bug with CONST value
+- BZ#3731: left shift for IP addresses not available to non-system users
+
 * Tue May 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.13-20150519
 - Rebuilt.
 - BZ#3712: Concurrency issue on querying the SQL catalog
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+monetdb (11.19.15-20150603) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#3707: var() possibly not working in debug builds
+  * BZ#3720: Incorrect results on joining with same table
+  * BZ#3725: LEFT JOIN bug with CONST value
+  * BZ#3731: left shift for IP addresses not available to non-system users
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 03 Jun 2015 12:31:39 +0200
+
 monetdb (11.19.13-20150519) 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=11:6:0
+GDK_VERSION=11:7:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:4:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=18:2:1
+MONETDB5_VERSION=18:3:1
 
 # version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=6:2:0
+STREAM_VERSION=6:3:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to