valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove leftover conflict markers (oops! :-/ )

Browse Source
This commit is contained in:
C. R. Oldham 2017-04-18 10:57:39 -06:00
parent b26be652dd
commit 1460f82ce4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud/clouds/vmware.py
View File

@ -2570,7 +2570,7 @@ def create(vm_):
config_spec.memoryMB = memory_mb
if devices:
specs = _manage_devices(devices, vm=object_ref, new_vm_name=vm_['name'])
specs = _manage_devices(devices, vm=object_ref, new_vm_name=vm_name)
config_spec.deviceChange = specs['device_specs']
if extra_config: