You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/02 13:40:38 UTC
[1/2] git commit: updated refs/heads/master to 5ebcc43
Repository: cloudstack
Updated Branches:
refs/heads/master 9c90eff87 -> 5ebcc4371
CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2d4d297
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2d4d297
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2d4d297
Branch: refs/heads/master
Commit: c2d4d2972dc7d87e0adc94cb809e27d5e51f95c1
Parents: 901d47c
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Fri Oct 30 22:13:56 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Fri Oct 30 22:13:56 2015 -0600
----------------------------------------------------------------------
tools/marvin/marvin/lib/base.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2d4d297/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index fc49fd2..32e2d59 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1945,14 +1945,17 @@ class ServiceOffering:
if "isvolatile" in services:
cmd.isvolatile = services["isvolatile"]
+ if "customizediops" in services:
+ cmd.customizediops = services["customizediops"]
+
if "miniops" in services:
cmd.miniops = services["miniops"]
if "maxiops" in services:
cmd.maxiops = services["maxiops"]
- if "customizediops" in services:
- cmd.customizediops = services["customizediops"]
+ if "hypervisorsnapshotreserve" in services:
+ cmd.hypervisorsnapshotreserve = services["hypervisorsnapshotreserve"]
if "offerha" in services:
cmd.offerha = services["offerha"]
@@ -2024,6 +2027,9 @@ class DiskOffering:
if "miniops" in services:
cmd.miniops = services["miniops"]
+ if "hypervisorsnapshotreserve" in services:
+ cmd.hypervisorsnapshotreserve = services["hypervisorsnapshotreserve"]
+
if "provisioningtype" in services:
cmd.provisioningtype = services["provisioningtype"]
[2/2] git commit: updated refs/heads/master to 5ebcc43
Posted by re...@apache.org.
Merge pull request #1016 from mike-tutkowski/hsr_marvin
CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings
https://issues.apache.org/jira/browse/CLOUDSTACK-9008
* pr/1016:
CLOUDSTACK-9008 - Pass hypervisor snapshot reserve field in when creating compute and disk offerings
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ebcc437
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ebcc437
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ebcc437
Branch: refs/heads/master
Commit: 5ebcc4371a993580205251790582cb99dc8d46be
Parents: 9c90eff c2d4d29
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 2 13:40:11 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Nov 2 13:40:11 2015 +0100
----------------------------------------------------------------------
tools/marvin/marvin/lib/base.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------