summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
diff options
context:
space:
mode:
authorDan Firth <dan.firth@codethink.co.uk>2013-09-27 09:51:31 +0000
committerDan Firth <dan.firth@codethink.co.uk>2013-09-27 11:15:48 +0000
commit1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (patch)
treea9cbd2149e9b4b3d10f605367e3a96760972cde1 /morphlib/plugins/branch_and_merge_plugin.py
parent3d93d272079b602aefe5d3bcd660d4a3307f3aad (diff)
downloadmorph-1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c.tar.gz
Dropped support for 'disk-size' from system morphology files'
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
-rw-r--r--morphlib/plugins/branch_and_merge_plugin.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 37d5e40c..3be61297 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -360,8 +360,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
'system': [
'kind',
'description',
- 'disk-size',
- '_disk-size',
'configuration-extensions',
],
'stratum': [