Commit 2be7c4cc authored by Guido Trotter's avatar Guido Trotter
Browse files

cluster-merge: remove a hardcoded constant


Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent d2b17e37
......@@ -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[:]:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment