projects
/
ganeti-local
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d2b17e3
)
cluster-merge: remove a hardcoded constant
author
Guido Trotter
<ultrotter@google.com>
Tue, 26 Jul 2011 08:46:02 +0000
(10:46 +0200)
committer
Guido Trotter
<ultrotter@google.com>
Tue, 26 Jul 2011 08:55:10 +0000
(10:55 +0200)
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
tools/cluster-merge
patch
|
blob
|
history
diff --git
a/tools/cluster-merge
b/tools/cluster-merge
index
d4504df
..
6025211
100755
(executable)
--- 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[:]: