Changeset: 761ef574146e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=761ef574146e
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (50 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -602,3 +602,6 @@ 77c8f3354e948ccd094ab3e53631b9fe272da8ea
30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_3
77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release
30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
+c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_5
+30be7bd4aec0b5daf3d2f3a26a1043c04b88bb6d Jul2015_release
+c7c0a76e663e34bcddae683b385c8e5a919ffd84 Jul2015_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -996,6 +996,10 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Mon Aug 24 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.5-20150824
+- Rebuilt.
+- BZ#3730: SAMPLE function not sampling randomly
+
* Tue Aug 18 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.3-20150818
- Rebuilt.
- BZ#3361: constants as MAL function parameters prevent intermediate reuse
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monetdb (11.21.5) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3730: SAMPLE function not sampling randomly
+
+ -- Sjoerd Mullender <sjo...@acm.org> Mon, 24 Aug 2015 12:52:24 +0200
+
monetdb (11.21.3) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,7 +36,7 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=12:1:0
+GDK_VERSION=12:2:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=7:5:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
