Changeset: 05f4e62bc679 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05f4e62bc679
Modified Files:
        MonetDB.spec
        debian/changelog
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Dec2016
Branch: Dec2016
Log Message:

Moved contents of ChangeLog.Dec2016 to MonetDB.spec, debian/changelog and 
ChangeLog-Archive.


diffs (68 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -972,6 +972,16 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- Rebuilt.
+- BZ#6260: Sqlitelogictest crash
+- BZ#6288: Function cannot find column in merge table
+- BZ#6295: msqldump writes unescaped timestamp values when using inserts
+
+* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- monetdb5: Fixed a bug causing a crash during cleanup when mserver5 is stopped
+  with monetdb stop database.
+
 * Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
 - Rebuilt.
 - BZ#6259: crash on select query from sqlitelogictests
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+monetdb (11.25.21) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6260: Sqlitelogictest crash
+  * BZ#6288: Function cannot find column in merge table
+  * BZ#6295: msqldump writes unescaped timestamp values when using inserts
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 25 Apr 2017 11:05:40 +0200
+
+monetdb (11.25.21) unstable; urgency=low
+
+  * monetdb5: Fixed a bug causing a crash during cleanup when mserver5 is 
stopped
+    with monetdb stop database.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 19 Apr 2017 11:05:40 +0200
+
 monetdb (11.25.19) unstable; urgency=low
 
   * Rebuilt.
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- Fixed a bug causing a crash during cleanup when mserver5 is stopped
+  with monetdb stop database.
+
 * Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
 - Some memory leaks were plugged.
 
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a bug causing a crash during cleanup when mserver5 is stopped
-  with monetdb stop database.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to