The branch, status-test-2 has been updated
via 937823cc73eb098230acff4b1583f6d01f26c21a (commit)
via 0e6c06ac38fd82adf124d111717502055501974a (commit)
via c278c798d41a35f58ca81f8f0e08e4dab51eba9b (commit)
from 28d0648725e7de4e4d0e8569e3fbfb0fa1d7f934 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=status-test-2
- Log -----------------------------------------------------------------
commit 937823cc73eb098230acff4b1583f6d01f26c21a
Merge: 28d0648725e7de4e4d0e8569e3fbfb0fa1d7f934
0e6c06ac38fd82adf124d111717502055501974a
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date: Fri Nov 27 12:50:45 2009 +1100
Merge commit 'martins/status-test' into status-test-2
commit 0e6c06ac38fd82adf124d111717502055501974a
Merge: 143f1fa3cc4588505e3992c601153ea08be8432d
c278c798d41a35f58ca81f8f0e08e4dab51eba9b
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Nov 27 12:49:31 2009 +1100
Merge commit 'martins-svart/status-test-2' into status-test
commit c278c798d41a35f58ca81f8f0e08e4dab51eba9b
Author: Martin Schwenke <mar...@meltin.net>
Date: Fri Nov 27 12:04:02 2009 +1100
Event script infrastructure: add reload event to check_options().
Signed-off-by: Martin Schwenke <mar...@meltin.net>
-----------------------------------------------------------------------
Summary of changes:
server/eventscript.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/eventscript.c b/server/eventscript.c
index 2508542..2c30cb2 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -774,6 +774,7 @@ static bool check_options(enum ctdb_eventscript_call call,
const char *options)
case CTDB_EVENT_MONITOR:
case CTDB_EVENT_STATUS:
case CTDB_EVENT_SHUTDOWN:
+ case CTDB_EVENT_RELOAD:
return count_words(options) == 0;
case CTDB_EVENT_TAKE_IP: /* interface, IP address, netmask bits. */
--
CTDB repository
