Merge 1.2.2 into asyncio

Conflicts:
	gns3server/version.py
This commit is contained in:
Julien Duponchelle committed 2015-01-16 09:43:58 +01:00
commit 7a767a6b92
2 files changed
+15

No files matched your search

@@ -454,6 +454,8 @@ class VirtualBoxVM(object):
"""
log.info("VirtualBox VM {name} [id={id}] has set the VM name to {vmname}".format(name=self._name, id=self._id, vmname=vmname))
if self._linked_clone:
self._modify_vm('--name "{}"'.format(vmname))
self._vmname = vmname
@property