The branch, master has been updated
via 87c89b7c2a14e2ee79a3efc7e8125842bc04bf23 (commit)
via 98abd344342a011a8599411deae79f94abc09541 (commit)
from 11734be353a1e246163eda631d35dfe55d1d6fb1 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 87c89b7c2a14e2ee79a3efc7e8125842bc04bf23
Author: Michael Adam <[email protected]>
Date: Fri Feb 22 12:42:10 2013 +0100
server:persistent: fix a debug message (copy'n'paste error)
Signed-off-by: Michael Adam <[email protected]>
commit 98abd344342a011a8599411deae79f94abc09541
Author: Volker Lendecke <[email protected]>
Date: Tue Mar 12 13:53:58 2013 +0100
fix a typo
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
server/ctdb_persistent.c | 5 +++--
tools/ctdb.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index 09c404f..2b3da32 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -128,8 +128,9 @@ void ctdb_persistent_finish_trans3_commits(struct
ctdb_context *ctdb)
struct ctdb_db_context *ctdb_db;
if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
- DEBUG(DEBUG_INFO, ("ctdb_persistent_store_timeout: ignoring "
- "timeout during recovery\n"));
+ DEBUG(DEBUG_INFO, ("ctdb_persistent_finish_trans3_commits: "
+ "skipping execution when recovery is "
+ "active\n"));
return;
}
diff --git a/tools/ctdb.c b/tools/ctdb.c
index ff7dc44..bf79801 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -2283,7 +2283,7 @@ static int control_delip(struct ctdb_context *ctdb, int
argc, const char **argv)
return -1;
}
- /* This is an optimsation. If this node is hosting the IP
+ /* This is an optimisation. If this node is hosting the IP
* then try to move it somewhere else without invoking a full
* takeover run. We don't care if this doesn't work!
*/
--
CTDB repository
