Changeset: ab3e7bd9fde7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab3e7bd9fde7 Modified Files: MonetDB.spec clients/python/setup.py configure.ag Branch: default Log Message:
Merge with Apr2011 branch. diffs (67 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -439,3 +439,5 @@ e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1 be8ff3e8c6150ec40f4e0d1ba9789bec23621f88 Mar2011_1 568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 +568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1 +ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -576,6 +576,12 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421 +- Rebuilt. + +* Mon Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421 +- merovingian: Fix monetdb return code upon failure to start/stop a database + * Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414 - Rebuilt. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +monetdb (11.3.1-20110421) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <[email protected]> Thu, 21 Apr 2011 09:38:31 +0200 + +monetdb (11.3.1-20110421) unstable; urgency=low + + * merovingian: Fix monetdb return code upon failure to start/stop a database + + -- Fabian Groffen <[email protected]> Mon, 18 Apr 2011 09:38:31 +0200 + monetdb (11.3.1-20110414) unstable; urgency=low * Rebuilt. 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 Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421 +- Fix monetdb return code upon failure to start/stop a database + * Wed Feb 16 2011 Fabian Groffen <[email protected]> - 11.3.1-20110414 - The forward property for databases has been removed. Instead, only a global proxy or redirect mode can be set using monetdbd. diff --git a/tools/merovingian/ChangeLog.Apr2011 b/tools/merovingian/ChangeLog.Apr2011 --- a/tools/merovingian/ChangeLog.Apr2011 +++ b/tools/merovingian/ChangeLog.Apr2011 @@ -1,6 +1,3 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog -* Mon Apr 18 2011 Fabian Groffen <[email protected]> -- Fix monetdb return code upon failure to start/stop a database - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
