cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/resize-root to 944d75f
Date Tue, 11 Mar 2014 18:54:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/resize-root a2faaaddb -> 944d75fb6


resize-root: adjust documentation and checking on rootdisksize parameter


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

Branch: refs/heads/resize-root
Commit: 944d75fb6d5153179e16249a491cedaba0d1d494
Parents: a2faaad
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Mon Feb 10 19:53:10 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Mon Feb 10 19:53:10 2014 -0700

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/944d75fb/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 87a68a6..a7d116f 100755
--- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -118,7 +118,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
     @Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, description = "the arbitrary
size for the DATADISK volume. Mutually exclusive with diskOfferingId")
     private Long size;
 
-    @Parameter(name = ApiConstants.ROOT_DISK_SIZE, type = CommandType.LONG, since = "4.4",
description = "Optional field to resize root disk on deploy. Only applies to template-based
deployments. Analogous to details[0].rootdisksize")
+    @Parameter(name = ApiConstants.ROOT_DISK_SIZE, type = CommandType.LONG, description =
"Optional field to resize root disk on deploy. Only applies to template-based deployments.
Analogous to details[0].rootdisksize, which takes precedence over this parameter if both are
provided")
     private Long rootdisksize;
 
     @Parameter(name = ApiConstants.GROUP, type = CommandType.STRING, description = "an optional
group for the virtual machine")
@@ -219,7 +219,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
                 }
             }
         }
-        if (rootdisksize != null) {
+        if (rootdisksize != null && !customparameterMap.containsKey("rootdisksize"))
{
             customparameterMap.put("rootdisksize", rootdisksize.toString());
         }
         return customparameterMap;


Mime
View raw message