Prevents lots of spurious warnings like:
2011-02-10 17:00:22,776: CRITICAL Configuration data is not consistent:
Not enough master candidates: actual 3, target 4

Signed-off-by: Stephen Shirley <[email protected]>
---
 tools/cluster-merge |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 52ecfc2..d2e8c1f 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -273,7 +273,6 @@ class Merger(object):
 
       for node in other_config.GetNodeList():
         node_info = other_config.GetNodeInfo(node)
-        node_info.master_candidate = False
         my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
         fake_ec_id += 1
 
-- 
1.7.3.1

Reply via email to