Revision 2be7c4cc tools/cluster-merge

b/tools/cluster-merge
507 507
          grp.name = new_name
508 508

  
509 509
      # User wants to merge conflicting groups
510
      elif self.groups == 'merge':
510
      elif self.groups == _GROUPS_MERGE:
511 511
        for other_grp in conflicts:
512 512
          logging.info("Merging local and remote '%s' groups", other_grp.name)
513 513
          for node_name in other_grp.members[:]:

Also available in: Unified diff