diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-01 13:12:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-01 13:12:00 +0000 |
| commit | b048b1a5bd7508e35e955dff8bd176b76bbb7354 (patch) | |
| tree | 8e3ceb9722310464350ee0ade98e0b077393a9ef /heatclient | |
| parent | d9b2909e380efb02950fb91db3336fac5f28780b (diff) | |
| parent | 4623e35cc66f17c4f8d723f5c42d55e4d2429cad (diff) | |
| download | python-heatclient-0.2.8.tar.gz | |
Merge "Do not use the '+' operation dict_items()"0.2.8
Diffstat (limited to 'heatclient')
| -rw-r--r-- | heatclient/v1/shell.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 3315124..508d7db 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -84,7 +84,7 @@ def do_stack_create(hc, args): 'disable_rollback': not(args.enable_rollback), 'parameters': utils.format_parameters(args.parameters), 'template': template, - 'files': dict(tpl_files.items() + env_files.items()), + 'files': dict(list(tpl_files.items()) + list(env_files.items())), 'environment': env } |