[3/3] git commit: updated refs/heads/master to 120e1cc
Merge pull request #810 from ashwinswaroop/feature_x This is the fix for the JIRA issue CLOUDSTACK-8817.This is my first contribution to Apache CloudStack. The return values for endpoint and startpoint have now been changed to Integer instead of String. Please let me know if this is the only change that is required or if there are additional files which will be impacted by this change which require modification also. * pr/810: CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int This is the fix for the JIRA issue CLOUDSTACK-8817. The return values for endpoint and startpoint are now Integer instead of String. Signed-off-by: Wido den Hollander Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/120e1cc9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/120e1cc9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/120e1cc9 Branch: refs/heads/master Commit: 120e1cc934815ad9a58c4b5e89f551114bb3 Parents: ff1ce07 221624d Author: Wido den Hollander Authored: Sun Sep 13 22:24:00 2015 +0200 Committer: Wido den Hollander Committed: Sun Sep 13 22:24:00 2015 +0200 -- .../org/apache/cloudstack/api/response/FirewallResponse.java | 8 server/src/com/cloud/api/ApiResponseHelper.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) --
[1/3] git commit: updated refs/heads/master to 120e1cc
Repository: cloudstack
Updated Branches:
refs/heads/master ff1ce07ae -> 120e1cc93
This is the fix for the JIRA issue CLOUDSTACK-8817. The return values for
endpoint and startpoint are now Integer instead of String.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d626c11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d626c11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d626c11
Branch: refs/heads/master
Commit: 4d626c11bc4f029788ddc0e12340d8e880521f8b
Parents: ff1ce07
Author: Ashwin Swaroop
Authored: Fri Sep 11 18:27:31 2015 -0400
Committer: Ashwin Swaroop
Committed: Fri Sep 11 18:27:31 2015 -0400
--
api/src/org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d626c11/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 4c1342a..368f732 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -37,11 +37,11 @@ public class FirewallResponse extends BaseResponse {
@SerializedName(ApiConstants.START_PORT)
@Param(description = "the starting port of firewall rule's port range")
-private String startPort;
+private Integer startPort;
@SerializedName(ApiConstants.END_PORT)
@Param(description = "the ending port of firewall rule's port range")
-private String endPort;
+private Integer endPort;
@SerializedName(ApiConstants.IP_ADDRESS_ID)
@Param(description = "the public ip address id for the firewall rule")
[2/3] git commit: updated refs/heads/master to 120e1cc
CLOUDSTACK-8817: listFirewallRules response JSON startport/endport not an int
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/221624d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/221624d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/221624d2
Branch: refs/heads/master
Commit: 221624d2fe70289f1a70eb908027167634858012
Parents: 4d626c1
Author: Ashwin Swaroop
Authored: Sun Sep 13 14:45:44 2015 -0400
Committer: Ashwin Swaroop
Committed: Sun Sep 13 14:45:44 2015 -0400
--
api/src/org/apache/cloudstack/api/response/FirewallResponse.java | 4 ++--
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221624d2/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
index 368f732..462bd1b 100644
--- a/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java
@@ -87,11 +87,11 @@ public class FirewallResponse extends BaseResponse {
this.protocol = protocol;
}
-public void setStartPort(String startPort) {
+public void setStartPort(Integer startPort) {
this.startPort = startPort;
}
-public void setEndPort(String endPort) {
+public void setEndPort(Integer endPort) {
this.endPort = endPort;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221624d2/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 06c68c4..6ee7c26 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2124,11 +2124,11 @@ public class ApiResponseHelper implements
ResponseGenerator {
response.setId(fwRule.getUuid());
response.setProtocol(fwRule.getProtocol());
if (fwRule.getSourcePortStart() != null) {
-
response.setStartPort(Integer.toString(fwRule.getSourcePortStart()));
+response.setStartPort(fwRule.getSourcePortStart());
}
if (fwRule.getSourcePortEnd() != null) {
-response.setEndPort(Integer.toString(fwRule.getSourcePortEnd()));
+response.setEndPort(fwRule.getSourcePortEnd());
}
List cidrs =
ApiDBUtils.findFirewallSourceCidrs(fwRule.getId());
[5/6] git commit: updated refs/heads/master to f888e93
CLOUDSTACK-8816 Systemvm reboot event doesnt have uuids. Fixed the same
Also removed duplicate console proxy event thats generated both for ssvm
and console proxy reboot.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35884649
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35884649
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35884649
Branch: refs/heads/master
Commit: 358846492a2b7b65683d8b0c4c4bdec78792dc50
Parents: 3bd5352
Author: Rajani Karuturi
Authored: Wed Sep 9 14:21:44 2015 +0530
Committer: Rajani Karuturi
Committed: Wed Sep 9 14:23:29 2015 +0530
--
api/src/com/cloud/event/EventTypes.java | 28 +---
.../com/cloud/server/ManagementServerImpl.java | 1 -
2 files changed, 13 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35884649/api/src/com/cloud/event/EventTypes.java
--
diff --git a/api/src/com/cloud/event/EventTypes.java
b/api/src/com/cloud/event/EventTypes.java
index 870c7e7..9a264a5 100644
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -63,10 +63,8 @@ import com.cloud.storage.snapshot.SnapshotPolicy;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.user.User;
-import com.cloud.vm.ConsoleProxy;
import com.cloud.vm.Nic;
import com.cloud.vm.NicSecondaryIp;
-import com.cloud.vm.SecondaryStorageVm;
import com.cloud.vm.VirtualMachine;
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.usage.Usage;
@@ -557,13 +555,13 @@ public class EventTypes {
entityEventDetails.put(EVENT_ROUTER_HA, VirtualRouter.class);
entityEventDetails.put(EVENT_ROUTER_UPGRADE, VirtualRouter.class);
-entityEventDetails.put(EVENT_PROXY_CREATE, ConsoleProxy.class);
-entityEventDetails.put(EVENT_PROXY_DESTROY, ConsoleProxy.class);
-entityEventDetails.put(EVENT_PROXY_START, ConsoleProxy.class);
-entityEventDetails.put(EVENT_PROXY_STOP, ConsoleProxy.class);
-entityEventDetails.put(EVENT_PROXY_REBOOT, ConsoleProxy.class);
-entityEventDetails.put(EVENT_ROUTER_HA, ConsoleProxy.class);
-entityEventDetails.put(EVENT_PROXY_HA, ConsoleProxy.class);
+entityEventDetails.put(EVENT_PROXY_CREATE, VirtualMachine.class);
+entityEventDetails.put(EVENT_PROXY_DESTROY, VirtualMachine.class);
+entityEventDetails.put(EVENT_PROXY_START, VirtualMachine.class);
+entityEventDetails.put(EVENT_PROXY_STOP, VirtualMachine.class);
+entityEventDetails.put(EVENT_PROXY_REBOOT, VirtualMachine.class);
+entityEventDetails.put(EVENT_ROUTER_HA, VirtualMachine.class);
+entityEventDetails.put(EVENT_PROXY_HA, VirtualMachine.class);
entityEventDetails.put(EVENT_VNC_CONNECT, "VNC");
entityEventDetails.put(EVENT_VNC_DISCONNECT, "VNC");
@@ -668,12 +666,12 @@ public class EventTypes {
entityEventDetails.put(EVENT_ISO_UPLOAD, "Iso");
// SSVM
-entityEventDetails.put(EVENT_SSVM_CREATE, SecondaryStorageVm.class);
-entityEventDetails.put(EVENT_SSVM_DESTROY, SecondaryStorageVm.class);
-entityEventDetails.put(EVENT_SSVM_START, SecondaryStorageVm.class);
-entityEventDetails.put(EVENT_SSVM_STOP, SecondaryStorageVm.class);
-entityEventDetails.put(EVENT_SSVM_REBOOT, SecondaryStorageVm.class);
-entityEventDetails.put(EVENT_SSVM_HA, SecondaryStorageVm.class);
+entityEventDetails.put(EVENT_SSVM_CREATE, VirtualMachine.class);
+entityEventDetails.put(EVENT_SSVM_DESTROY, VirtualMachine.class);
+entityEventDetails.put(EVENT_SSVM_START, VirtualMachine.class);
+entityEventDetails.put(EVENT_SSVM_STOP, VirtualMachine.class);
+entityEventDetails.put(EVENT_SSVM_REBOOT, VirtualMachine.class);
+entityEventDetails.put(EVENT_SSVM_HA, VirtualMachine.class);
// Service Offerings
entityEventDetails.put(EVENT_SERVICE_OFFERING_CREATE,
ServiceOffering.class);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35884649/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java
b/server/src/com/cloud/server/ManagementServerImpl.java
index 8483018..25071a2 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3250,7 +3250,6 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
}
@Override
-@ActionEvent(eventType = EventTypes.EVENT_PROXY_REBOOT, eventDescri
[6/6] git commit: updated refs/heads/master to f888e93
Merge pull request #782 from karuturi/CLOUDSTACK-8816
Cloudstack 8816 entityuuid missing in some of the eventsIn some of the events
generated, entity uuid was missing making it difficult to find the entity.
Fixed the same.
Tested it on rabbitmq instance.
There are the events before after the fix:
Before
routing_key: management-server.ActionEvent.ACCOUNT-DELETE.Account.*
exchange: cloudstack-events
message_count: 2
payload:
{"eventDateTime":"2015-09-04 17:59:24
+0530","status":"Scheduled","description":"deleting User test4 (id: 28) and
accountId \u003d
28","event":"ACCOUNT.DELETE","Account":"c09e2e81-8edc-4c27-b072-25005b522b63","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
payload_bytes: 304
payload_encoding: string
redelivered: False
routing_key: management-server.AsyncJobEvent.complete.Account.*
exchange: cloudstack-events
message_count: 0
payload:
{"cmdInfo":"{\"id\":\"9dd3abc2-3f8b-4852-aa60-a74b234acb13\",\"response\":\"json\",\"sessionkey\":\"5ig1ItP2_5v-mgY4cVJbJN5hw_w\",\"ctxDetails\":\"
{\\\"interface
com.cloud.user.Account\\\":\\\"9dd3abc2-3f8b-4852-aa60-a74b234acb13\\\"}
\",\"cmdEventType\":\"ACCOUNT.DELETE\",\"expires\":\"2015-09-07T11:11:56+\",\"ctxUserId\":\"2\",\"signatureversion\":\"3\",\"httpmethod\":\"GET\",\"uuid\":\"9dd3abc2-3f8b-4852-aa60-a74b234acb13\",\"ctxAccountId\":\"2\",\"ctxStartEventId\":\"447\"}","instanceType":"Account","jobId":"5004989d-0cde-4922-8afa-66bf38b75ea7","status":"SUCCEEDED","processStatus":"0","commandEventType":"ACCOUNT.DELETE","resultCode":"0","command":"org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd","jobResult":"org.apache.cloudstack.api.response.SuccessResponse/null/
{\"success\":true}
","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
payload_bytes: 914
payload_encoding: string
redelivered: False
After
routing_key:
management-server.ActionEvent.ACCOUNT-DELETE.Account.e5e2db91-414d-484c-99d5-c4e265c14ad8
exchange: cloudstack-events
message_count: 13
payload: {"eventDateTime":"2015-09-07 17:32:26
+0530","status":"Completed","description":"Successfully completed deleting
account. Account Id:
45","event":"ACCOUNT.DELETE","entityuuid":"e5e2db91-414d-484c-99d5-c4e265c14ad8","entity":"com.cloud.user.Account","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
payload_bytes: 344
payload_encoding: string
redelivered: True
routing_key:
management-server.AsyncJobEvent.complete.Account.e5e2db91-414d-484c-99d5-c4e265c14ad8
exchange: cloudstack-events
message_count: 12
payload:
{"cmdInfo":"{\"id\":\"e5e2db91-414d-484c-99d5-c4e265c14ad8\",\"response\":\"json\",\"sessionkey\":\"8AJVbn8HIpg5LZ_VaVfSPs_QN2k\",\"ctxDetails\":\"{\\\"interface
com.cloud.user.Account\\\":\\\"e5e2db91-414d-484c-99d5-c4e265c14ad8\\\"}\",\"cmdEventType\":\"ACCOUNT.DELETE\",\"expires\":\"2015-09-07T12:17:42+\",\"ctxUserId\":\"2\",\"signatureversion\":\"3\",\"httpmethod\":\"GET\",\"uuid\":\"e5e2db91-414d-484c-99d5-c4e265c14ad8\",\"ctxAccountId\":\"2\",\"ctxStartEventId\":\"465\"}","instanceType":"Account","instanceUuid":"e5e2db91-414d-484c-99d5-c4e265c14ad8","jobId":"0bb08486-6d9f-4e9f-bfef-b7463c42e71b","status":"SUCCEEDED","processStatus":"0","commandEventType":"ACCOUNT.DELETE","resultCode":"0","command":"org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd","jobResult":"org.apache.cloudstack.api.response.SuccessResponse/null/{\"success\":true}","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
payload_bytes: 968
payload_encoding: string
redelivered: True
* pr/782:
CLOUDSTACK-8816 Systemvm reboot event doesnt have uuids. Fixed the same
CLOUDSTACK-8816: Project UUID is not showing for some of operations in
RabbitMQ.
CLOUDSTACK-8816: entity uuid missing in create network event
CLOUDSTACK-8816: instance uuid is missing in events for delete account
CLOUDSTACK-8816 Fixed entityUuid missing in some cases is events
Signed-off-by: Rajani Karuturi
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f888e93e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f888e93e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f888e93e
Branch: refs/heads/master
Commit: f888e93e440589756f4cf41b6c9b8a9facbfa471
Parents: 120e1cc 3588464
Author: Rajani Karuturi
Authored: Mon Sep 14
[2/6] git commit: updated refs/heads/master to f888e93
CLOUDSTACK-8816: Project UUID is not showing for some of operations in RabbitMQ.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bd53521
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bd53521
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bd53521
Branch: refs/heads/master
Commit: 3bd53521e8944db447bfa69494d7f01f73727808
Parents: b12d473
Author: Rajani Karuturi
Authored: Wed Sep 9 12:18:08 2015 +0530
Committer: Rajani Karuturi
Committed: Wed Sep 9 14:23:28 2015 +0530
--
api/src/org/apache/cloudstack/context/CallContext.java | 10 ++
server/src/com/cloud/api/ApiDispatcher.java| 9 +
server/src/com/cloud/event/ActionEventInterceptor.java | 2 +-
server/src/com/cloud/event/ActionEventUtils.java | 2 +-
server/src/com/cloud/projects/ProjectManagerImpl.java | 1 +
5 files changed, 22 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bd53521/api/src/org/apache/cloudstack/context/CallContext.java
--
diff --git a/api/src/org/apache/cloudstack/context/CallContext.java
b/api/src/org/apache/cloudstack/context/CallContext.java
index 73da826..2619f4a 100644
--- a/api/src/org/apache/cloudstack/context/CallContext.java
+++ b/api/src/org/apache/cloudstack/context/CallContext.java
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Stack;
import java.util.UUID;
+import com.cloud.projects.Project;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
@@ -59,6 +60,7 @@ public class CallContext {
private User user;
private long userId;
private final Map context = new HashMap();
+private Project project;
static EntityManager s_entityMgr;
@@ -314,6 +316,14 @@ public class CallContext {
this.eventDescription = eventDescription;
}
+public Project getProject() {
+return this.project;
+}
+
+public void setProject(Project project) {
+this.project = project;
+}
+
/**
* Whether to display the event to the end user.
* @return true - if the event is to be displayed to the end user, false
otherwise.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bd53521/server/src/com/cloud/api/ApiDispatcher.java
--
diff --git a/server/src/com/cloud/api/ApiDispatcher.java
b/server/src/com/cloud/api/ApiDispatcher.java
index 0dc1164..7375588 100644
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -21,6 +21,8 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
+import com.cloud.projects.Project;
+import com.cloud.utils.db.EntityManager;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.ControlledEntity;
@@ -54,6 +56,9 @@ public class ApiDispatcher {
@Inject
AccountManager _accountMgr;
+@Inject
+EntityManager _entityMgr;
+
@Inject()
protected DispatchChainFactory dispatchChainFactory;
@@ -102,6 +107,10 @@ public class ApiDispatcher {
final CallContext ctx = CallContext.current();
ctx.setEventDisplayEnabled(cmd.isDisplay());
+if(params.get(ApiConstants.PROJECT_ID) != null) {
+Project project =
_entityMgr.findByUuidIncludingRemoved(Project.class,
params.get(ApiConstants.PROJECT_ID));
+ctx.setProject(project);
+}
// TODO This if shouldn't be here. Use polymorphism and move it to
validateSpecificParameters
if (cmd instanceof BaseAsyncCmd) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bd53521/server/src/com/cloud/event/ActionEventInterceptor.java
--
diff --git a/server/src/com/cloud/event/ActionEventInterceptor.java
b/server/src/com/cloud/event/ActionEventInterceptor.java
index 5d2d51a..d2dacd9 100644
--- a/server/src/com/cloud/event/ActionEventInterceptor.java
+++ b/server/src/com/cloud/event/ActionEventInterceptor.java
@@ -84,7 +84,7 @@ public class ActionEventInterceptor implements
ComponentMethodInterceptor, Metho
for (ActionEvent actionEvent : getActionEvents(method)) {
CallContext ctx = CallContext.current();
long userId = ctx.getCallingUserId();
-long accountId = ctx.getCallingAccountId();
+long accountId = ctx.getProject() != null ?
ctx.getProject().getProjectAccountId() : ctx.getCallingAccountId();//This
should be the entity owner id rather than the Calling User Account Id.
long startEventId = ctx.getStartEventId();
String eventDescription = getEventDescription(actionEven
[3/6] git commit: updated refs/heads/master to f888e93
CLOUDSTACK-8816: entity uuid missing in create network event
*Before*
| routing_key | exchange |
message_count |
payload
| payload_bytes | payload_encoding |
redelivered |
| management-server.ActionEvent.NETWORK-CREATE.Network.* | cloudstack-events |
0 | {"eventDateTime":"2015-09-09 09:35:02
+0530","status":"Completed","description":"Successfully completed creating
network. Network Id:
206","event":"NETWORK.CREATE","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
| 259 | string | False |
*After*
|routing_key
| exchange | message_count |
payload
| payload_bytes | payload_encoding | redelivered |
|
management-server.ActionEvent.NETWORK-CREATE.Network.c9ed8d0d-6e58-456e-be58-28bb809f0b3a
| cloudstack-events | 52|
{"eventDateTime":"2015-09-09 10:12:37
+0530","status":"Completed","description":"Successfully completed creating
network. Network Id:
210","event":"NETWORK.CREATE","entityuuid":"c9ed8d0d-6e58-456e-be58-28bb809f0b3a","entity":"com.cloud.network.Network","account":"bd73dc2e-35c0-11e5-b094-d4ae52cb9af0","user":"bd7ea748-35c0-11e5-b094-d4ae52cb9af0"}
| 348 | string | False |
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b12d4730
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b12d4730
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b12d4730
Branch: refs/heads/master
Commit: b12d4730a6a3b0654c52a6ea3f0b5b75cd37d841
Parents: 0d12666
Author: Rajani Karuturi
Authored: Wed Sep 9 10:34:04 2015 +0530
Committer: Rajani Karuturi
Committed: Wed Sep 9 14:23:28 2015 +0530
--
.../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b12d4730/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
--
diff --git
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 50ddc59..2a87bf5 100644
---
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2083,6 +2083,7 @@ public class NetworkOrchestrator extends ManagerBase
implements NetworkOrchestra
});
CallContext.current().setEventDetails("Network Id: " +
network.getId());
+CallContext.current().putContextParameter(Network.class,
network.getUuid());
return network;
}
[1/6] git commit: updated refs/heads/master to f888e93
Repository: cloudstack
Updated Branches:
refs/heads/master 120e1cc93 -> f888e93e4
CLOUDSTACK-8816 Fixed entityUuid missing in some cases is events
context parameters is Map. This has been used
interchangeably with String and class object resulting the param value
not being available in some cases if its put with object and get with
class.forName()
made the put and get consistent by using Object as key everywhere.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/37c3451a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/37c3451a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/37c3451a
Branch: refs/heads/master
Commit: 37c3451aaee5ca8ae385cd62a1b9f37cc44ad3fe
Parents: 28d18dc
Author: Rajani Karuturi
Authored: Mon Sep 7 17:12:49 2015 +0530
Committer: Rajani Karuturi
Committed: Wed Sep 9 14:23:27 2015 +0530
--
server/src/com/cloud/api/ApiServer.java | 15
.../cloud/api/dispatch/ParamProcessWorker.java | 4 +--
.../src/com/cloud/event/ActionEventUtils.java | 38
.../storage/snapshot/SnapshotManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
5 files changed, 18 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37c3451a/server/src/com/cloud/api/ApiServer.java
--
diff --git a/server/src/com/cloud/api/ApiServer.java
b/server/src/com/cloud/api/ApiServer.java
index 4da8b1e..1459dc2 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -277,11 +277,10 @@ public class ApiServer extends ManagerBase implements
HttpRequestHandler, ApiSer
}
}
// For some reason, the instanceType / instanceId are not abstract,
which means we may get null values.
-org.apache.cloudstack.framework.events.Event event = new
org.apache.cloudstack.framework.events.Event(
-"management-server",
-EventCategory.ASYNC_JOB_CHANGE_EVENT.getName(),
-jobEvent,
-(job.getInstanceType() != null ?
job.getInstanceType().toString() : "unknown"), null);
+String instanceType = job.getInstanceType() != null ?
job.getInstanceType() : "unknown";
+String instanceUuid = job.getInstanceId() != null ?
ApiDBUtils.findJobInstanceUuid(job) : "";
+org.apache.cloudstack.framework.events.Event event = new
org.apache.cloudstack.framework.events.Event("management-server",
EventCategory.ASYNC_JOB_CHANGE_EVENT.getName(),
+jobEvent, instanceType, instanceUuid);
Map eventDescription = new HashMap();
eventDescription.put("command", job.getCmd());
@@ -289,8 +288,8 @@ public class ApiServer extends ManagerBase implements
HttpRequestHandler, ApiSer
eventDescription.put("account", jobOwner.getUuid());
eventDescription.put("processStatus", "" + job.getProcessStatus());
eventDescription.put("resultCode", "" + job.getResultCode());
-eventDescription.put("instanceUuid", (job.getInstanceId() != null ?
ApiDBUtils.findJobInstanceUuid(job) : "" ) );
-eventDescription.put("instanceType", (job.getInstanceType() != null ?
job.getInstanceType().toString() : "unknown"));
+eventDescription.put("instanceUuid", instanceUuid);
+eventDescription.put("instanceType", instanceType);
eventDescription.put("commandEventType", cmdEventType);
eventDescription.put("jobId", job.getUuid());
eventDescription.put("jobResult", job.getResult());
@@ -638,7 +637,7 @@ public class ApiServer extends ManagerBase implements
HttpRequestHandler, ApiSer
params.put("id", objectId.toString());
Class entityClass =
EventTypes.getEntityClassForEvent(createCmd.getEventType());
if (entityClass != null)
-ctx.putContextParameter(entityClass.getName(), objectUuid);
+ctx.putContextParameter(entityClass, objectUuid);
} else {
// Extract the uuid before params are processed and id
reflects internal db id
objectUuid = params.get(ApiConstants.ID);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37c3451a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
--
diff --git a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
b/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
index eb3b77a..3c81ff6 100644
--- a/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
+++ b/server/src/com/cloud/api/dispatch/ParamProcessWorker.java
@@ -410,7 +410,7 @@ public class ParamProcessWorker
[4/6] git commit: updated refs/heads/master to f888e93
CLOUDSTACK-8816: instance uuid is missing in events for delete account
instance uuid is populated from the getInstanceId of the command which
is returning null. returning the correct value now.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d126664
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d126664
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d126664
Branch: refs/heads/master
Commit: 0d1266648214cb0a007046916bd5af2ea1f692bf
Parents: 37c3451
Author: Rajani Karuturi
Authored: Mon Sep 7 17:18:01 2015 +0530
Committer: Rajani Karuturi
Committed: Wed Sep 9 14:23:28 2015 +0530
--
.../cloudstack/api/command/admin/account/DeleteAccountCmd.java | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d126664/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index 5754ec5..2a2e16d 100644
---
a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -114,4 +114,9 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.Account;
}
+
+@Override
+public Long getInstanceId() {
+return id;
+}
}
[1/2] git commit: updated refs/heads/4.5 to d58dfbf
Repository: cloudstack
Updated Branches:
refs/heads/4.5 15ef2b114 -> d58dfbf21
CLOUDSTACK-8443: Support CentOS 7 for 4.5
This is based on two PRs:
- 731
- 757
This commit is based on the 4.5 branch for a future 4.5 release.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b8fd246
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b8fd246
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b8fd246
Branch: refs/heads/4.5
Commit: 2b8fd2469f5dad54684c253560a1fa7fcebc5892
Parents: 15ef2b1
Author: Wido den Hollander
Authored: Sun Sep 13 15:30:20 2015 +0200
Committer: Wido den Hollander
Committed: Sun Sep 13 15:30:20 2015 +0200
--
agent/bindir/cloud-setup-agent.in | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 23 --
python/lib/cloud_utils.py | 247 +--
python/lib/cloudutils/serviceConfig.py | 11 +-
python/lib/cloudutils/utilities.py | 44 ++--
scripts/vm/hypervisor/kvm/setup-cgroups.sh | 52
setup/db/db/schema-421to430.sql | 3 +-
7 files changed, 145 insertions(+), 243 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b8fd246/agent/bindir/cloud-setup-agent.in
--
diff --git a/agent/bindir/cloud-setup-agent.in
b/agent/bindir/cloud-setup-agent.in
index 9ec2499..e8f8f2f 100755
--- a/agent/bindir/cloud-setup-agent.in
+++ b/agent/bindir/cloud-setup-agent.in
@@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -65,7 +65,7 @@ def getUserInputs():
if oldHypervisor == "":
oldHypervisor = "kvm"
-hypervisor = raw_input("Please input the Hypervisor type
kvm/lxc:[%s]"%oldCluster)
+hypervisor = raw_input("Please input the Hypervisor type
kvm/lxc:[%s]"%oldHypervisor)
if hypervisor == "":
hypervisor = oldHypervisor
@@ -138,7 +138,7 @@ if __name__ == '__main__':
glbEnv.nics.append(options.prvNic)
glbEnv.nics.append(options.pubNic)
glbEnv.nics.append(options.guestNic)
-
+
print "Starting to configure your system:"
syscfg = sysConfigFactory.getSysConfigFactory(glbEnv)
try:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b8fd246/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index c9242ea..45acef0 100755
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -312,7 +312,6 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
private String _ovsPvlanVmPath;
private String _routerProxyPath;
private String _ovsTunnelPath;
-private String _setupCgroupPath;
private String _host;
private String _dcId;
private String _pod;
@@ -718,17 +717,6 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
_hypervisorType = HypervisorType.KVM;
}
-//Verify that cpu,cpuacct cgroups are not co-mounted
-if(HypervisorType.LXC.equals(getHypervisorType())){
-_setupCgroupPath = Script.findScript(kvmScriptsDir,
"setup-cgroups.sh");
-if (_setupCgroupPath == null) {
-throw new ConfigurationException("Unable to find the
setup-cgroups.sh");
-}
-if(!checkCgroups()){
-throw new ConfigurationException("cpu,cpuacct cgroups are
co-mounted");
-}
-}
-
_hypervisorURI = (String)params.get("hypervisor.uri");
if (_hypervisorURI == null) {
_hypervisorURI =
LibvirtConnection.getHypervisorURI(_hypervisorType.toString());
@@ -5308,17 +5296,6 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
return _hypervisorType;
}
-private boolean checkCgroups(){
-final Script command = new Script(_setupCgroupPath, 5 * 1000,
s_logger);
-String result;
-result
[2/2] git commit: updated refs/heads/4.5 to d58dfbf
Merge pull request #814 from wido/CLOUDSTACK-8443 CLOUDSTACK-8443: Support CentOS 7 for 4.5This is based on two PRs: - 731 - 757 This commit is based on the 4.5 branch for a future 4.5 release. * pr/814: CLOUDSTACK-8443: Support CentOS 7 for 4.5 Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d58dfbf2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d58dfbf2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d58dfbf2 Branch: refs/heads/4.5 Commit: d58dfbf21bd813fda1fa3a9b2aa0090ee058d51f Parents: 15ef2b1 2b8fd24 Author: Rohit Yadav Authored: Mon Sep 14 09:52:03 2015 +0530 Committer: Rohit Yadav Committed: Mon Sep 14 09:52:06 2015 +0530 -- agent/bindir/cloud-setup-agent.in | 8 +- .../kvm/resource/LibvirtComputingResource.java | 23 -- python/lib/cloud_utils.py | 247 +-- python/lib/cloudutils/serviceConfig.py | 11 +- python/lib/cloudutils/utilities.py | 44 ++-- scripts/vm/hypervisor/kvm/setup-cgroups.sh | 52 setup/db/db/schema-421to430.sql | 3 +- 7 files changed, 145 insertions(+), 243 deletions(-) --
[2/2] git commit: updated refs/heads/master to ac80a2d
Merge pull request #808 from karuturi/CLOUDSTACK-8835 CLOUDSTACK-8835: Added alerts incase of template download failureAuthored-By: @sanjaytripathi Reviewed-By: @devdeep * pr/808: CLOUDSTACK-8835: Added alerts incase of template download failure Signed-off-by: Rajani Karuturi Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac80a2df Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac80a2df Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac80a2df Branch: refs/heads/master Commit: ac80a2df503441d00024cb87dfa6ff2a9edb8097 Parents: f888e93 9a35f87 Author: Rajani Karuturi Authored: Mon Sep 14 09:47:44 2015 +0530 Committer: Rajani Karuturi Committed: Mon Sep 14 09:47:46 2015 +0530 -- .../apache/cloudstack/alert/AlertService.java | 1 + .../storage/image/TemplateServiceImpl.java | 1 + .../storage/image/BaseImageStoreDriverImpl.java | 12 + .../src/com/cloud/alert/AlertManagerImpl.java | 3 +- .../storage/ImageStoreUploadMonitorImpl.java| 55 +--- 5 files changed, 53 insertions(+), 19 deletions(-) --
[1/2] git commit: updated refs/heads/master to ac80a2d
Repository: cloudstack
Updated Branches:
refs/heads/master f888e93e4 -> ac80a2df5
CLOUDSTACK-8835: Added alerts incase of template download failure
Reviewed-By: Devdeep
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a35f87d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a35f87d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a35f87d
Branch: refs/heads/master
Commit: 9a35f87d370fb781763d1d243d2f225e3fb60c4a
Parents: 2d90f18
Author: Sanjay Tripathi
Authored: Thu Feb 26 15:34:29 2015 +0530
Committer: Rajani Karuturi
Committed: Fri Sep 11 16:07:35 2015 +0530
--
.../apache/cloudstack/alert/AlertService.java | 1 +
.../storage/image/TemplateServiceImpl.java | 1 +
.../storage/image/BaseImageStoreDriverImpl.java | 12 +
.../src/com/cloud/alert/AlertManagerImpl.java | 3 +-
.../storage/ImageStoreUploadMonitorImpl.java| 55 +---
5 files changed, 53 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a35f87d/api/src/org/apache/cloudstack/alert/AlertService.java
--
diff --git a/api/src/org/apache/cloudstack/alert/AlertService.java
b/api/src/org/apache/cloudstack/alert/AlertService.java
index 2e98aea..2b827eb 100644
--- a/api/src/org/apache/cloudstack/alert/AlertService.java
+++ b/api/src/org/apache/cloudstack/alert/AlertService.java
@@ -65,6 +65,7 @@ public interface AlertService {
public static final AlertType ALERT_TYPE_LOCAL_STORAGE = new
AlertType((short)25, "ALERT.STORAGE.LOCAL", true);
public static final AlertType ALERT_TYPE_RESOURCE_LIMIT_EXCEEDED = new
AlertType((short)26, "ALERT.RESOURCE.EXCEED", true);
public static final AlertType ALERT_TYPE_SYNC = new
AlertType((short)27, "ALERT.TYPE.SYNC", true);
+public static final AlertType ALERT_TYPE_UPLOAD_FAILED = new
AlertType((short)28, "ALERT.UPLOAD.FAILED", true);
public short getType() {
return type;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a35f87d/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
--
diff --git
a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index ccb70c4..69dc7c7 100644
---
a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++
b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -334,6 +334,7 @@ public class TemplateServiceImpl implements TemplateService
{
String msg = "Template " + tmplt.getName()
+ ":" + tmplt.getId() + " is corrupted on secondary storage " +
tmpltStore.getId();
tmpltStore.setErrorString(msg);
s_logger.info(msg);
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED, zoneId,
null, msg, msg);
if (tmplt.getState() ==
VirtualMachineTemplate.State.NotUploaded || tmplt.getState() ==
VirtualMachineTemplate.State.UploadInProgress) {
s_logger.info("Template Sync found " +
uniqueName + " on image store " + storeId + " uploaded using SSVM as corrupted,
marking it as failed");
tmpltStore.setState(State.Failed);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a35f87d/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
--
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
index 25aa8e8..9c7dc46 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
@@ -50,10 +50,12 @@ import com.cloud.agent.api.storage.DownloadAnswer;
import com.cloud.agent.api.storage.Proxy;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataTO;
+import com.cloud.alert.AlertManager;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplateZoneDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.download.DownloadMonito
[1/2] git commit: updated refs/heads/4.5 to af38c49
Repository: cloudstack Updated Branches: refs/heads/4.5 d58dfbf21 -> af38c492d cloudstack: set next version to 4.5.3-SNAPSHOT Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4f552d4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4f552d4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4f552d4 Branch: refs/heads/4.5 Commit: a4f552d46dd3ffa608a75ae79e4154bbf6766305 Parents: d58dfbf Author: Rohit Yadav Authored: Mon Sep 14 09:59:40 2015 +0530 Committer: Rohit Yadav Committed: Mon Sep 14 09:59:40 2015 +0530 -- agent/pom.xml | 2 +- api/pom.xml | 2 +- awsapi/pom.xml| 2 +- client/pom.xml| 2 +- core/pom.xml | 2 +- developer/pom.xml | 2 +- engine/api/pom.xml| 2 +- engine/components-api/pom.xml | 2 +- engine/network/pom.xml| 2 +- engine/orchestration/pom.xml | 2 +- engine/pom.xml| 2 +- engine/schema/pom.xml | 2 +- engine/service/pom.xml| 2 +- engine/storage/cache/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- engine/storage/image/pom.xml | 2 +- engine/storage/integration-test/pom.xml | 2 +- engine/storage/pom.xml| 2 +- engine/storage/snapshot/pom.xml | 2 +- engine/storage/volume/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- framework/config/pom.xml | 2 +- framework/db/pom.xml | 2 +- framework/events/pom.xml | 2 +- framework/ipc/pom.xml | 2 +- framework/jobs/pom.xml| 2 +- framework/managed-context/pom.xml | 2 +- framework/pom.xml | 2 +- framework/rest/pom.xml| 2 +- framework/security/pom.xml| 2 +- framework/spring/lifecycle/pom.xml| 2 +- framework/spring/module/pom.xml | 2 +- maven-standard/pom.xml| 2 +- plugins/acl/static-role-based/pom.xml | 2 +- plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +- plugins/affinity-group-processors/host-anti-affinity/pom.xml | 2 +- plugins/alert-handlers/snmp-alerts/pom.xml| 2 +- plugins/alert-handlers/syslog-alerts/pom.xml | 2 +- plugins/api/discovery/pom.xml | 2 +- plugins/api/rate-limit/pom.xml| 2 +- plugins/api/solidfire-intg-test/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/dedicated-resources/pom.xml | 2 +- plugins/deployment-planners/implicit-dedication/pom.xml | 2 +- plugins/deployment-planners/user-concentrated-pod/pom.xml | 2 +- plugins/deployment-planners/user-dispersing/pom.xml | 2 +- plugins/event-bus/inmemory/pom.xml| 2 +- plugins/event-bus/rabbitmq/pom.xml| 2 +- plugins/file-systems/netapp/pom.xml | 2 +- plugins/ha-planners/skip-heurestics/pom.xml | 2 +- plugins/host-allocators/random/pom.xml| 2 +- plugins/hypervisors/baremetal/pom.xml | 2 +- plugins/hypervisors/hyperv/pom.xml| 2 +- plugins/hypervisors/kvm/pom.xml | 2 +- plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/simulator/pom.xml | 2 +- plugins/hypervisors/ucs/pom.xml | 2 +- plugins/hypervisors/vmware/pom.xml| 2 +- plugins/hypervisors/xenserver/pom.xml | 2 +- plugins/network-elements/bigswitch-vns/pom.xml| 2 +- plugins/network-elements/brocade-vcs/pom.xml | 2 +-
[2/2] git commit: updated refs/heads/4.5 to af38c49
debian: add 4.5.3-snapshot to changelog Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af38c492 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af38c492 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af38c492 Branch: refs/heads/4.5 Commit: af38c492d844572910f6f6157ac0bfa2c71318d5 Parents: a4f552d Author: Rohit Yadav Authored: Mon Sep 14 10:01:58 2015 +0530 Committer: Rohit Yadav Committed: Mon Sep 14 10:01:58 2015 +0530 -- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af38c492/debian/changelog -- diff --git a/debian/changelog b/debian/changelog index 2843055..898fcab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloudstack (4.5.3-snapshot) unstable; urgency=low + + * Update the version to 4.5.3 snapshot + + -- the Apache CloudStack project Mon, 14 Sep 2015 10:01:38 +0530 + cloudstack (4.5.2) unstable; urgency=low * Update the version to 4.5.2
[2/2] git commit: updated refs/heads/master to 0b73d19
Merge pull request #802 from anshul1886/CLOUDSTACK-8828 Fixed secstorage.proxy is not setting proxy configuration on SSVM in some cases * pr/802: Fixed secstorage.proxy is not setting proxy configuration on SSVM in some cases Signed-off-by: Rajani Karuturi Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b73d193 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b73d193 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b73d193 Branch: refs/heads/master Commit: 0b73d193684723fca2b936625f3df3dee60de273 Parents: ac80a2d 2c81ebe Author: Rajani Karuturi Authored: Mon Sep 14 12:01:16 2015 +0530 Committer: Rajani Karuturi Committed: Mon Sep 14 12:01:18 2015 +0530 -- core/src/org/apache/cloudstack/storage/command/DownloadCommand.java | 1 + 1 file changed, 1 insertion(+) --
[1/2] git commit: updated refs/heads/master to 0b73d19
Repository: cloudstack
Updated Branches:
refs/heads/master ac80a2df5 -> 0b73d1936
Fixed secstorage.proxy is not setting proxy configuration on SSVM in some cases
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c81ebe7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c81ebe7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c81ebe7
Branch: refs/heads/master
Commit: 2c81ebe72f0215d5cc27a10970ef0a3b259e0017
Parents: 2d90f18
Author: Anshul Gangwar
Authored: Fri Sep 11 13:37:08 2015 +0530
Committer: Anshul Gangwar
Committed: Fri Sep 11 13:37:39 2015 +0530
--
core/src/org/apache/cloudstack/storage/command/DownloadCommand.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c81ebe7/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
--
diff --git
a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
index db637c1..5dfc22e 100644
--- a/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
+++ b/core/src/org/apache/cloudstack/storage/command/DownloadCommand.java
@@ -63,6 +63,7 @@ public class DownloadCommand extends AbstractDownloadCommand
implements Internal
resourceType = that.resourceType;
installPath = that.installPath;
_store = that._store;
+_proxy = that._proxy;
}
public DownloadCommand(TemplateObjectTO template, Long
maxDownloadSizeInBytes) {
