Changeset: b4f78b80e346 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4f78b80e346
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (48 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -644,3 +644,6 @@ 0027cb04877b7687f45277a81a25253a63e9f21f
ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_1
ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_release
deeebb69952f76e3377664bb97997885b283f9d1 fix-bad-merge
+afc859894553ef804cded49a83b035d9d2cda73b Dec2016_3
+ea0fe76e0095771bccca626b39e3e839a90ba320 Dec2016_release
+afc859894553ef804cded49a83b035d9d2cda73b Dec2016_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -955,6 +955,9 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Sat Dec 17 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.3-20161217
+- Rebuilt.
+
* Wed Dec 14 2016 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> -
11.25.1-20161214
- Rebuilt.
- BZ#3357: Implement setQueryTimeout()
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.25.3) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Sat, 17 Dec 2016 11:58:13 +0100
+
monetdb (11.25.1) 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=14:0:0
+GDK_VERSION=14:1:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=8:1:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
