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/10/23 15:54:42 UTC
[1/3] git commit: updated refs/heads/master to fb0871b
Repository: cloudstack
Updated Branches:
refs/heads/master 2b34df0da -> fb0871bdc
Add agent name in received response
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/358936ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/358936ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/358936ff
Branch: refs/heads/master
Commit: 358936ffb723195138b080791a804031b39a382e
Parents: 2ce5a0c
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Fri Oct 16 11:43:25 2015 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Oct 16 11:43:25 2015 +0200
----------------------------------------------------------------------
core/src/com/cloud/agent/transport/Request.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/358936ff/core/src/com/cloud/agent/transport/Request.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java
index 3db9ae8..7b8dd0d 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());
}
[2/3] git commit: updated refs/heads/master to fb0871b
Posted by re...@apache.org.
Modify description of startvm in DeployVMCmd
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/948449e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/948449e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/948449e2
Branch: refs/heads/master
Commit: 948449e2ca1763b4cab2f98a096bd2e680233ffe
Parents: 358936f
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Mon Oct 19 14:25:07 2015 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Mon Oct 19 15:12:02 2015 +0200
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948449e2/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 77b10ec..82c281d 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
[3/3] git commit: updated refs/heads/master to fb0871b
Posted by re...@apache.org.
Merge pull request #936 from ustcweizhou/agent-name
Add agent name in received responseBefore change:
2015-10-15 12:55:34,268 DEBUG [c.c.a.t.Request] (RouterStatusMonitor-1:ctx-d2b917a4) Seq 20-2693152577167557361: Sending { Cmd , MgmtId: 345051313197, via: 20(KVM015), Ver: v1, Flags: 100011, [{"com.cloud.agent.api.routing.GetRouterAlertsCommand":{"previousAlertTimeStamp":"1970-01-01 00:00:00","accessDetails":{"router.ip":"169.254.3.13"},"wait":0}}] }
2015-10-15 12:55:34,416 DEBUG [c.c.a.t.Request] (AgentManager-Handler-7:null) Seq 20-2693152577167557361: Processing: { Ans: , MgmtId: 345051313197, via: 20, Ver: v1, Flags: 10, [{"com.cloud.agent.api.GetRouterAlertsAnswer":{"result":true,"wait":0}}] }
2015-10-15 12:55:34,416 DEBUG [c.c.a.t.Request] (RouterStatusMonitor-1:ctx-d2b917a4) Seq 20-2693152577167557361: Received: { Ans: , MgmtId: 345051313197, via: 20, Ver: v1, Flags: 10, { GetRouterAlertsAnswer } }
After change:
2015-10-15 13:31:04,562 DEBUG [c.c.a.t.Request] (RouterStatusMonitor-1:ctx-cf9a7691) Seq 22-6444651066767179831: Sending { Cmd , MgmtId: 345051313197, via: 22(node12), Ver: v1, Flags: 100011, [{"com.cloud.agent.api.routing.GetRouterAlertsCommand":{"previousAlertTimeStamp":"1970-01-01 00:00:00","accessDetails":{"router.ip":"169.254.3.89"},"wait":0}}] }
2015-10-15 13:31:04,676 DEBUG [c.c.a.t.Request] (AgentManager-Handler-4:null) Seq 22-6444651066767179831: Processing: { Ans: , MgmtId: 345051313197, via: 22, Ver: v1, Flags: 10, [{"com.cloud.agent.api.GetRouterAlertsAnswer":{"result":true,"wait":0}}] }
2015-10-15 13:31:04,677 DEBUG [c.c.a.t.Request] (RouterStatusMonitor-1:ctx-cf9a7691) Seq 22-6444651066767179831: Received: { Ans: , MgmtId: 345051313197, via: 22(node12), Ver: v1, Flags: 10, { GetRouterAlertsAnswer } }
* pr/936:
Modify description of startvm in DeployVMCmd
Add agent name in received response
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/fb0871bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fb0871bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fb0871bd
Branch: refs/heads/master
Commit: fb0871bdcac6746a2e517a4e71f5e1642bef1fe7
Parents: 2b34df0 948449e
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Oct 23 15:53:41 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Oct 23 15:53:42 2015 +0200
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 2 +-
core/src/com/cloud/agent/transport/Request.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------