Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0227fcd9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0227fcd9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0227fcd9 Branch: refs/heads/4.0.0-grouping Commit: 0227fcd9ca4289a6c6ccaf852c077d4fee4f0709 Parents: 05e1ddc 3d3db93 Author: Udara Liyanage <[email protected]> Authored: Tue Aug 19 16:15:33 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Tue Aug 19 16:15:33 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 1 - .../controller/iaases/OpenstackNovaIaas.java | 9 +----- .../impl/CloudControllerServiceImpl.java | 1 - .../internal/CloudControllerDSComponent.java | 6 ---- .../CartridgeInstanceDataPublisher.java | 17 +++++----- .../InstanceStatusEventMessageListener.java | 1 - .../status/InstanceStatusEventMessageQueue.java | 3 +- .../controller/topology/TopologyBuilder.java | 2 -- .../controller/util/CloudControllerUtil.java | 1 - .../validate/AWSEC2PartitionValidator.java | 11 +++---- .../validate/DockerPartitionValidator.java | 34 ++++++++++++++++++-- .../OpenstackNovaPartitionValidator.java | 28 +++++++++++++++- .../validate/VCloudPartitionValidator.java | 6 ++-- 13 files changed, 79 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0227fcd9/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
