summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-08-16 08:56:00 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2013-08-16 13:05:18 +0000
commit10a788b3642608de1c0ecc7a41055f950c0652dd (patch)
tree587e3438b5acd5e2566b00102cec29369efb0ba2 /morphlib/plugins/branch_and_merge_plugin.py
parent2514eb9717ab6f8161d1fb403ca2bfff9e1169ea (diff)
downloadmorph-10a788b3642608de1c0ecc7a41055f950c0652dd.tar.gz
Add support for a `cluster` type of morphology.
Add the necessary tests to keep CoverageTestRunner happy.
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 38b882a0..85e74501 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -349,7 +349,11 @@ class BranchAndMergePlugin(cliapp.Plugin):
],
'chunk': [
'name',
- ]
+ ],
+ 'cluster': [
+ 'name',
+ 'systems',
+ ],
}
also_known = {
@@ -376,6 +380,9 @@ class BranchAndMergePlugin(cliapp.Plugin):
'max-jobs',
'chunks',
'devices',
+ ],
+ 'cluster': [
+ 'kind'
]
}