Repository: cloudstack Updated Branches: refs/heads/multiple-disk-ova 87d87a6f3 -> ebc92d6cd
CLOUDSTACK-4757. Update API params Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebc92d6c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebc92d6c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebc92d6c Branch: refs/heads/multiple-disk-ova Commit: ebc92d6cd758d031f9d05ab7b277d5541149f771 Parents: 87d87a6 Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Wed May 21 21:25:43 2014 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Wed May 21 21:27:41 2014 +0530 ---------------------------------------------------------------------- .../cloudstack/api/command/user/template/ListTemplatesCmd.java | 2 +- api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebc92d6c/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index d257f60..1982ea0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -72,7 +72,7 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd { private Boolean showRemoved; @Parameter(name = ApiConstants.PARENT_TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list datadisk templates by parent template id", - since = "4.4") + since = "4.5") private Long parentTemplateId; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebc92d6c/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 c59cea2..8c7f6f2 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 @@ -190,7 +190,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd { @Parameter(name = ApiConstants.DEPLOYMENT_PLANNER, type = CommandType.STRING, description = "Deployment planner to use for vm allocation. Available to ROOT admin only", since = "4.4", authorized = { RoleType.Admin }) private String deploymentPlanner; - @Parameter(name = ApiConstants.DATADISKTEMPLATE_TO_DISKOFFERING_LIST, type = CommandType.MAP, since = "4.4", description = "datadisk template to disk-offering mapping;" + + @Parameter(name = ApiConstants.DATADISKTEMPLATE_TO_DISKOFFERING_LIST, type = CommandType.MAP, since = "4.5", description = "datadisk template to disk-offering mapping;" + " an optional parameter used to create additional data disks from datadisk templates; can't be specified with diskOfferingId parameter") private Map dataDiskTemplateToDiskOfferingList;
