Changeset: 4a6a6523c789 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a6a6523c789
Modified Files:
        MonetDB.spec
        debian/changelog
        sql/ChangeLog-Archive
        sql/ChangeLog.Apr2012
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Apr2012
Branch: Apr2012
Log Message:

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


diffs (98 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -631,6 +631,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed May 16 2012 Fabian Groffen <[email protected]> - 11.9.5-20120516
+- Rebuilt.
+
+* Tue May 15 2012 Fabian Groffen <[email protected]> - 11.9.5-20120516
+- merovingian: Fixed a bug where connecting to a stopped multiplex-funnel 
would result
+  in a 'there are no available connections' error.
+
+* Tue May 15 2012 Sjoerd Mullender <[email protected]> - 11.9.5-20120516
+- sql: Databases that were upgraded from the Aug2011 release have an error
+  in the catalog for SQL procedures.  This is now fixed.
+
 * Mon May 14 2012 Fabian Groffen <[email protected]> - 11.9.3-20120514
 - Rebuilt.
 
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+monetdb (11.9.5-20120516) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Fabian Groffen <[email protected]>  Wed, 16 May 2012 10:07:19 +0200
+
+monetdb (11.9.5-20120516) unstable; urgency=low
+
+  * merovingian: Fixed a bug where connecting to a stopped multiplex-funnel 
would result
+    in a 'there are no available connections' error.
+
+ -- Fabian Groffen <[email protected]>  Tue, 15 May 2012 10:07:19 +0200
+
+monetdb (11.9.5-20120516) unstable; urgency=low
+
+  * sql: Databases that were upgraded from the Aug2011 release have an error
+    in the catalog for SQL procedures.  This is now fixed.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 15 May 2012 10:07:19 +0200
+
 monetdb (11.9.3-20120514) unstable; urgency=low
 
   * Rebuilt.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue May 15 2012 Sjoerd Mullender <[email protected]> - 11.9.5-20120516
+- Databases that were upgraded from the Aug2011 release have an error
+  in the catalog for SQL procedures.  This is now fixed.
+
 * Fri Feb 17 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
 - Fixed a crash that happened at the end of a database upgrade to the
   Dec2011 database scheme.  The crash happened during cleanup after the
diff --git a/sql/ChangeLog.Apr2012 b/sql/ChangeLog.Apr2012
--- a/sql/ChangeLog.Apr2012
+++ b/sql/ChangeLog.Apr2012
@@ -1,7 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Tue May 15 2012 Sjoerd Mullender <[email protected]>
-- Databases that were upgraded from the Aug2011 release have an error
-  in the catalog for SQL procedures.  This is now fixed.
-
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,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue May 15 2012 Fabian Groffen <[email protected]> - 11.9.5-20120516
+- Fixed a bug where connecting to a stopped multiplex-funnel would result
+  in a 'there are no available connections' error.
+
 * Fri Mar  9 2012 Fabian Groffen <[email protected]> - 11.9.1-20120418
 - The logfile and pidfile monetdbd properties are now displayed with
   dbfarm path when relative
diff --git a/tools/merovingian/ChangeLog.Apr2012 
b/tools/merovingian/ChangeLog.Apr2012
--- a/tools/merovingian/ChangeLog.Apr2012
+++ b/tools/merovingian/ChangeLog.Apr2012
@@ -1,7 +1,3 @@
 # ChangeLog file for sql/src/backends/monet5/merovingian
 # This file is updated with mchangelog
 
-* Tue May 15 2012 Fabian Groffen <[email protected]>
-- Fixed a bug where connecting to a stopped multiplex-funnel would result
-  in a 'there are no available connections' error.
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to