[SCM] CTDB repository - branch 1.2 updated - ctdb-1.0.114-316-g3b75f59

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  3b75f59c1f2b349ac12d6210553afeb82415752b (commit)
       via  16f80a35c5c8748d64743222d5c46e7917d6e5d7 (commit)
       via  dd933c9d58d492bc0aeb90fb2671d284164a6b97 (commit)
      from  c724dc94ccb51e11c68ea89889503b72c6547c5e (commit)

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


- Log -----------------------------------------------------------------
commit 3b75f59c1f2b349ac12d6210553afeb82415752b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Aug 30 19:50:15 2010 +1000

    new version 1.2.4

commit 16f80a35c5c8748d64743222d5c46e7917d6e5d7
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 dd933c9d58d492bc0aeb90fb2671d284164a6b97
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 --
 packaging/RPM/ctdb.spec.in |    5 ++++-
 3 files changed, 6 insertions(+), 5 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
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 918471d..bf798ff 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.3
+Version: 1.2.4
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -142,6 +142,9 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Mon Aug 30 2010 : Version 1.2.4
+ - fix a bug in the ipreallocate eventscript handling
+ - remove a debug logentry
 * Mon Aug 30 2010 : Version 1.2.3
  - finish moving CTDB off the udnerlying filesystem.
    both tickles and statd information


-- 
CTDB repository