Changeset: 728e46f7a840 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=728e46f7a840 Modified Files: .hgtags MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Aug2018 debian/changelog libversions tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Aug2018 Branch: default Log Message:
Merge with Aug2018 branch. diffs (124 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -706,3 +706,6 @@ 9c824ea44063e239b7251dce71f9af741c682211 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_3 9c824ea44063e239b7251dce71f9af741c682211 Aug2018_release 2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release +3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_5 +2d06f2ece18a5718d9cbab6e7ad64ace6b7d95bd Aug2018_release +3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -997,6 +997,20 @@ done %postun -p /sbin/ldconfig %changelog +* Wed Aug 29 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829 +- Rebuilt. +- BZ#6506: Improper performance counters +- BZ#6606: Misleading parameter name in generate_series function +- BZ#6639: COMMENT ON TABLE abc IS NULL invalidly sets the remark column + to null where remark column is defined as NOT NULLable + +* Tue Aug 28 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829 +- buildtools: Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio + Debian/Ubuntu package. + +* Mon Aug 27 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829 +- merovingian: Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd. + * Tue Aug 21 2018 Sjoerd Mullender <[email protected]> - 11.31.3-20180821 - Rebuilt. diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Aug 28 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829 +- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio + Debian/Ubuntu package. + * Wed May 16 2018 Sjoerd Mullender <[email protected]> - 11.31.1-20180815 - On Windows, the separate MonetDB5-Geom installer has been incorporated into the main MonetDB5-SQL installer and is therefore no longer diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018 --- a/buildtools/ChangeLog.Aug2018 +++ b/buildtools/ChangeLog.Aug2018 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Aug 28 2018 Sjoerd Mullender <[email protected]> -- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio - Debian/Ubuntu package. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +monetdb (11.31.5) unstable; urgency=low + + * Rebuilt. + * BZ#6506: Improper performance counters + * BZ#6606: Misleading parameter name in generate_series function + * BZ#6639: COMMENT ON TABLE abc IS NULL invalidly sets the remark column + to null where remark column is defined as NOT NULLable + + -- Sjoerd Mullender <[email protected]> Wed, 29 Aug 2018 09:22:10 +0200 + +monetdb (11.31.5) unstable; urgency=low + + * buildtools: Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio + Debian/Ubuntu package. + + -- Sjoerd Mullender <[email protected]> Tue, 28 Aug 2018 09:22:10 +0200 + +monetdb (11.31.5) unstable; urgency=low + + * merovingian: Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd. + + -- Sjoerd Mullender <[email protected]> Mon, 27 Aug 2018 09:22:10 +0200 + monetdb (11.31.3) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -42,7 +42,7 @@ GDK_VERSION=17:1:0 MAPI_VERSION=11:0:1 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=25:1:0 +MONETDB5_VERSION=25:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=12:0:1 diff --git a/tools/merovingian/ChangeLog-Archive b/tools/merovingian/ChangeLog-Archive --- a/tools/merovingian/ChangeLog-Archive +++ b/tools/merovingian/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Aug 27 2018 Sjoerd Mullender <[email protected]> - 11.31.5-20180829 +- Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd. + * Wed Apr 4 2018 Panagiotis Koutsourakis <[email protected]> - 11.31.1-20180815 - Changed the monetdb profilerstart command to be more robust. If the server or stethoscope crashed before, the pid file is still there, diff --git a/tools/merovingian/ChangeLog.Aug2018 b/tools/merovingian/ChangeLog.Aug2018 --- a/tools/merovingian/ChangeLog.Aug2018 +++ b/tools/merovingian/ChangeLog.Aug2018 @@ -1,6 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Mon Aug 27 2018 Sjoerd Mullender <[email protected]> -- Added a "logrotate" configuration file. See /etc/logrotate.d/monetdbd. - _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
