From 2be7c4cc00df3d7361ea6ead49c7d69d3e8cde4b Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 26 Jul 2011 10:46:02 +0200
Subject: [PATCH] cluster-merge: remove a hardcoded constant
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
tools/cluster-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index d4504df4f..60252111c 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -507,7 +507,7 @@ class Merger(object):
grp.name = new_name
# User wants to merge conflicting groups
- elif self.groups == 'merge':
+ elif self.groups == _GROUPS_MERGE:
for other_grp in conflicts:
logging.info("Merging local and remote '%s' groups", other_grp.name)
for node_name in other_grp.members[:]:
--
GitLab