Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e2fac62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e2fac62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e2fac62 Branch: refs/heads/master Commit: 5e2fac62f38f9a50a00b67c4af135bc3c1063011 Parents: d052ada cbf7c38 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Wed Mar 26 16:25:01 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Wed Mar 26 16:25:01 2014 +0530 ---------------------------------------------------------------------- .../topology/AutoscalerTopologyReceiver.java | 5 +- .../topology/TopologyEventMessageListener.java | 53 +++++++++ .../topology/TopologyEventMessageQueue.java | 45 +++++++ .../cloud/controller/iaases/AWSEC2Iaas.java | 5 + .../controller/iaases/OpenstackNovaIaas.java | 94 +++++++++++++++ .../cloud/controller/iaases/VCloudIaas.java | 5 + .../impl/CloudControllerServiceImpl.java | 118 +++++++++++++++---- .../cloud/controller/interfaces/Iaas.java | 10 ++ .../util/CloudControllerConstants.java | 2 + .../utils/CartridgeSubscriptionUtils.java | 50 ++++++-- .../broker/publish/TopicPublisher.java | 12 +- .../health/stat/HealthStatReceiver.java | 4 +- .../topology/TopologyEventMessageDelegator.java | 12 +- .../receiver/topology/TopologyReceiver.java | 18 ++- .../jndi.properties.activemq.template.erb | 25 ++++ 15 files changed, 416 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
