[SCM] CTDB repository - branch master updated - ctdb-1.0.114-298-g14c4d99

[Ronnie Sahlberg]

The branch, master has been updated
       via  14c4d99513b4bdb94f60c3e9c4823e04b0833e60 (commit)
       via  e824af1a41f8ceec1edf6b3d1d6e1758fa00deb2 (commit)
      from  893465ddde0b730aa142f165cfdc4a57fc5517bf (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 14c4d99513b4bdb94f60c3e9c4823e04b0833e60
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 30 19:47:50 2010 +1000

    ouch, remove a dummy debug printout that snuck in there somehow

commit e824af1a41f8ceec1edf6b3d1d6e1758fa00deb2
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 30 19:42:30 2010 +1000

    ouch,   the ordering of the constants and the strings must be kept in sync
    manually   and ther eis no check for errors.     should fix this later

-----------------------------------------------------------------------

Summary of changes:
 common/ctdb_util.c     |    4 ++--
 config/events.d/60.nfs |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 4244a04..46c737a 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -685,6 +685,6 @@ const char *ctdb_eventscript_call_names[] = {
 	"status",
 	"shutdown",
 	"reload",
-	"ipreallocated",
-	"updateip"
+	"updateip",
+	"ipreallocated"
 };
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 6acc889..35f96c2 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -19,8 +19,6 @@ loadconfig
 
 ctdb_start_stop_service
 
-echo XX 60.nfs   $@
-
 case "$1" in 
      init)
 	# read statd from persistent database


-- 
CTDB repository