Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-05-18 11:25:41 +02:00
22 changed files with 65 additions and 53 deletions

View File

@ -82,8 +82,8 @@ class QemuVM(BaseNode):
try:
self.qemu_path = qemu_path
except QemuError as e:
# If the binary is not found for topologies 1.4 and later
# search via the platform otherwise use the binary name
# If the binary is not found for topologies 1.4 and later
# search via the platform otherwise use the binary name
if platform:
self.platform = platform
else: