diff --git a/tools/cluster-merge b/tools/cluster-merge index d4504df4f9d0366c0a65982bb23a1c0ad090e6e3..60252111c12120d2f4315cd14a90465736f47b04 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[:]: