[SCM] CTDB repository - branch master updated - ctdb-2.1-9-g124e2a4

[Amitay Isaacs]

The branch, master has been updated
       via  124e2a471aeda9c900fd898178a30522d7d74221 (commit)
      from  b054193d1d19a8eef998fa690899501f79badb8a (commit)

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


- Log -----------------------------------------------------------------
commit 124e2a471aeda9c900fd898178a30522d7d74221
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Jan 23 14:35:47 2013 +1100

    recoverd: Fix printing of node flags from local information
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 server/ctdb_recoverd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 0f8aa91..bffe2be 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3699,7 +3699,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
 				  nodemap->nodes[j].pnn, 
 				  nodemap->nodes[i].pnn, 
 				  remote_nodemaps[j]->nodes[i].flags,
-				  nodemap->nodes[j].flags));
+				  nodemap->nodes[i].flags));
 				if (i == j) {
 					DEBUG(DEBUG_ERR,("Use flags 0x%02x from remote node %d for cluster update of its own flags\n", remote_nodemaps[j]->nodes[i].flags, j));
 					update_flags_on_all_nodes(ctdb, nodemap, nodemap->nodes[i].pnn, remote_nodemaps[j]->nodes[i].flags);


-- 
CTDB repository