From 358936ffb723195138b080791a804031b39a382e Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 16 Oct 2015 11:43:25 +0200 Subject: [PATCH 1/2] Add agent name in received response --- core/src/com/cloud/agent/transport/Request.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java index 3db9ae888ac..7b8dd0dc0c0 100644 --- a/core/src/com/cloud/agent/transport/Request.java +++ b/core/src/com/cloud/agent/transport/Request.java @@ -177,6 +177,7 @@ public class Request { _mgmtId = that._mgmtId; _via = that._via; _agentId = that._agentId; + _agentName = that._agentName; setFromServer(!that.isFromServer()); } From 948449e2ca1763b4cab2f98a096bd2e680233ffe Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 19 Oct 2015 14:25:07 +0200 Subject: [PATCH 2/2] Modify description of startvm in DeployVMCmd --- .../org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 77b10ec0684..82c281dad46 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -167,7 +167,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd { @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Deploy vm for the project") private Long projectId; - @Parameter(name = ApiConstants.START_VM, type = CommandType.BOOLEAN, description = "true if network offering supports specifying ip ranges; defaulted to true if not specified") + @Parameter(name = ApiConstants.START_VM, type = CommandType.BOOLEAN, description = "true if start vm after creating; defaulted to true if not specified") private Boolean startVm; @ACL