Changeset: 402a59d472e2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=402a59d472e2 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Aug2018 MonetDB.spec debian/changelog libversions Branch: default Log Message:
Merge with Aug2018 branch. diffs (83 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Oct 10 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.11-20181011 +- Some subtle dependencies between RPMs have been fixed. + * Wed Feb 14 2018 Stefan Manegold <stefan.maneg...@cwi.nl> - 11.29.1-20180315 - mclient's execution time profiling options and output format have been changed. Instead of implicitly via the "--interactive"/"-i" diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,5 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog * Wed Oct 10 2018 Sjoerd Mullender <sjo...@acm.org> -- Some subtle dependencies between RPMs have been fixed. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1062,6 +1062,14 @@ done %postun -p /sbin/ldconfig %changelog +* Thu Oct 11 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.11-20181011 +- Rebuilt. +- BZ#6648: key property potentially wrong after type conversion +- BZ#6649: Projection inside within transaction gives wrong results + +* Wed Oct 10 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.11-20181011 +- MonetDB: Some subtle dependencies between RPMs have been fixed. + * Fri Oct 05 2018 Sjoerd Mullender <sjo...@acm.org> - 11.31.9-20181005 - Rebuilt. - BZ#6640: timestamp_to_str returning incorrectly adjusted results diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.31.11) unstable; urgency=low + + * Rebuilt. + * BZ#6648: key property potentially wrong after type conversion + * BZ#6649: Projection inside within transaction gives wrong results + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 11 Oct 2018 09:48:25 +0200 + +monetdb (11.31.11) unstable; urgency=low + + * MonetDB: Some subtle dependencies between RPMs have been fixed. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 10 Oct 2018 09:48:25 +0200 + monetdb (11.31.9) 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=17:2:0 +GDK_VERSION=17:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
