Repository: cloudstack Updated Branches: refs/heads/master 0ca3b4a4e -> bf9036c5a
Fixed a regression issue reported Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf9036c5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf9036c5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf9036c5 Branch: refs/heads/master Commit: bf9036c5a0852d18d6bcc21f010f95ccf766a727 Parents: 0ca3b4a Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Wed Aug 6 12:37:05 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Wed Aug 6 12:37:05 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/lib/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf9036c5/tools/marvin/marvin/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index ddfb8b3..3a1f7e6 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -369,10 +369,9 @@ class VirtualMachine: cmd.zoneid = zoneid elif "zoneid" in services: cmd.zoneid = services["zoneid"] + if hypervisor: cmd.hypervisor = hypervisor - elif "hypervisor" in services: - cmd.hypervisor = services["hypervisor"] if "displayname" in services: cmd.displayname = services["displayname"]
