Changeset: 71f8bec5bcae for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71f8bec5bcae Modified Files: sql/src/backends/monet5/merovingian/merovingian.c sql/src/backends/monet5/merovingian/merovingian_forkmserver.c sql/src/backends/monet5/merovingian/monetdb.1.in sql/src/backends/monet5/merovingian/properties.c Branch: default Log Message:
Merge from Jun2010, ignoring the actual removal of master/slave properties diffs (17 lines): diff -r dd6a4c184089 -r 71f8bec5bcae sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 --- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Fri Jul 16 13:10:02 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Fri Jul 16 13:14:41 2010 +0200 @@ -1,6 +1,13 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog + 16 Jul 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c, + merovingian_forkmserver.c, monetdb.1.in, properties.c: + Remove references to master/slave settings, since replication isn't yet + fully implemented in Jun2010 branch. + +*Jun2010-SP1 + 01 Jul 2010; Fabian Groffen <fab...@cwi.nl> merovingian.c: When a startup failure causes a shutdown, make sure we log this incident in the logfile, together with a message that the deamon was _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
