Merge remote-tracking branch 'origin/master'

This commit is contained in:
grossmj committed 2015-04-14 18:21:42 -06:00
commit aab4a7243b
20 files changed
+197 -114

No files matched your search

@@ -79,8 +79,9 @@ class VirtualBoxHandler:
yield from vm.set_ram(ram)
for name, value in request.json.items():
if hasattr(vm, name) and getattr(vm, name) != value:
setattr(vm, name, value)
if name != "vm_id":
if hasattr(vm, name) and getattr(vm, name) != value:
setattr(vm, name, value)
response.set_status(201)
response.json(vm)