[SCM] CTDB repository - branch master updated - ctdb-1.0.113-124-gda5fc07

[Ronnie Sahlberg]

The branch, master has been updated
       via  da5fc07baa9aa806c3cba52c00fb10cf8b7f2dc5 (commit)
       via  aa63f728152c37e31cecf2258efcdc8cf5ac0092 (commit)
      from  00b249d9d098d5ed03e21caed404e66336f63629 (commit)

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


- Log -----------------------------------------------------------------
commit da5fc07baa9aa806c3cba52c00fb10cf8b7f2dc5
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 23 11:00:23 2010 +0100

    fix bug #7152: check NFS-Shares, fails with to long path-names
    
    Thanks to Thomas Sesselmann <t.sesselmann at dkfz.de> .
    
    Michael

commit aa63f728152c37e31cecf2258efcdc8cf5ac0092
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 6 14:59:23 2010 +0100

    server:ctdb_send_dmaster_reply: fix a message typo.
    
    Michael

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

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


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 2115d46..d403792 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -84,7 +84,7 @@ case "$1" in
 	# and that its directories are available
 	[ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || {
 	    exportfs | grep -v '^#' | grep '^/' |
-	    sed -e 's/[[:space:]]*[^[:space:]]*$//' |
+	    sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
 	    ctdb_check_directories
 	} || exit $?
 
diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 6ad9305..e07b98c 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -151,7 +151,7 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db,
 	}
 
 	if (ctdb->methods == NULL) {
-		ctdb_fatal(ctdb, "ctdb_send_dmaster_reply cant update dmaster sicne transport is down");
+		ctdb_fatal(ctdb, "ctdb_send_dmaster_reply cant update dmaster since transport is down");
 		return;
 	}
 


-- 
CTDB repository