cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/master to b354893
Date Sat, 22 Mar 2014 17:10:03 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 5e3d4aeba -> b35489339


CLOUDSTACK-6170 (Fixed an issue where custom compute offering and custom storage IOPS were
leading to custom storage IOPS that were specified not being used)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3548933
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3548933
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3548933

Branch: refs/heads/master
Commit: b354893393dc9d9467d1999462a44063046a3c4e
Parents: 5e3d4ae
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Sat Mar 22 00:41:25 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Sat Mar 22 11:09:34 2014 -0600

----------------------------------------------------------------------
 engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 1 +
 engine/schema/src/com/cloud/storage/DiskOfferingVO.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3548933/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index 3873dd2..3be0aaa 100755
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -173,6 +173,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
             offering.getUseLocalStorage(),
             offering.getSystemUse(),
             true,
+            offering.isCustomizedIops(),
             offering.getDomainId());
         cpu = offering.getCpu();
         ramSize = offering.getRamSize();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3548933/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index d1a48d2..99214b2 100755
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -207,7 +207,7 @@ public class DiskOfferingVO implements DiskOffering {
     }
 
     public DiskOfferingVO(long id, String name, String displayText, boolean mirrored, String
tags, boolean recreatable,
-            boolean useLocalStorage, boolean systemUse, boolean customized, Long domainId)
{
+            boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops,
Long domainId) {
         this.id = id;
         type = Type.Service;
         this.name = name;
@@ -217,6 +217,7 @@ public class DiskOfferingVO implements DiskOffering {
         this.useLocalStorage = useLocalStorage;
         this.systemUse = systemUse;
         this.customized = customized;
+        this.customizedIops = customizedIops;
         this.domainId = domainId;
         uuid = UUID.randomUUID().toString();
         state = State.Active;


Mime
View raw message