diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-02-12 11:51:52 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-02-12 11:51:52 +0000 |
| commit | c00ee1c6852d5d02cd9d9fdf071b9a3d838ad6ef (patch) | |
| tree | 38b4ff8a91b977bb04c700a0e986c21c436266f3 /morphlib/plugins/branch_and_merge_plugin.py | |
| parent | d83af40a3cdff4905af0e41c60a96744078a4b52 (diff) | |
| parent | a9ec7e0bdf6b6dc9b15addbe9980f3b03fe342ea (diff) | |
| download | morph-c00ee1c6852d5d02cd9d9fdf071b9a3d838ad6ef.tar.gz | |
Merge branch 'liw/deployment-refactor' of git://git.baserock.org/baserock/baserock/morph
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 58aa8931..0f07c431 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -331,6 +331,7 @@ class BranchAndMergePlugin(cliapp.Plugin): 'description', 'disk-size', '_disk-size', + 'configuration-extensions', ], 'stratum': [ 'kind', |