Merge branch 'docker-grouping-merge' of
https://git-wip-us.apache.org/repos/asf/stratos into merge
Conflicts:
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/070f950b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/070f950b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/070f950b
Branch: refs/heads/docker-grouping-merge
Commit: 070f950b7f233b39781baf423ded64a55f36bcee
Parents: bcf2e2b 62d65fd
Author: Udara Liyanage <[email protected]>
Authored: Tue Nov 4 15:47:41 2014 +0530
Committer: Udara Liyanage <[email protected]>
Committed: Tue Nov 4 15:47:41 2014 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 5 +-
.../applications/ApplicationUtils.java | 2 +-
.../applications/topic/ApplicationBuilder.java | 558 +++++--------------
.../topic/ApplicationsEventPublisher.java | 4 +-
.../cloud/controller/CloudControllerClient.java | 4 +-
.../interfaces/AutoScalerServiceInterface.java | 2 +-
.../AutoscalerTopologyEventReceiver.java | 89 +--
.../monitor/cluster/AbstractClusterMonitor.java | 2 +-
.../monitor/cluster/ClusterMonitorFactory.java | 12 +-
.../KubernetesServiceClusterMonitor.java | 4 +-
.../monitor/cluster/VMClusterMonitor.java | 2 +-
.../cluster/VMServiceClusterMonitor.java | 4 +-
.../partition/deployers/PartitionDeployer.java | 117 ----
.../partition/deployers/PartitionReader.java | 154 -----
.../policy/deployers/AbstractPolicyReader.java | 93 ----
.../deployers/DeploymentPolicyDeployer.java | 114 ----
.../deployers/DeploymentPolicyReader.java | 130 -----
.../stratos/autoscaler/util/AutoscalerUtil.java | 4 +-
.../src/main/resources/META-INF/component.xml | 16 -
.../policy/DeploymentPolicyDeployerTest.java | 68 +--
.../receiver/ClusterStatusTopicReceiver.java | 113 ----
.../internal/CloudControllerDSComponent.java | 21 +-
.../application/ApplicationTopicReceiver.java | 60 ++
.../status/ClusterStatusTopicReceiver.java | 113 ++++
.../InstanceStatusEventMessageDelegator.java | 84 +++
.../InstanceStatusEventMessageListener.java | 84 +++
.../status/InstanceStatusEventMessageQueue.java | 45 ++
.../InstanceStatusEventMessageDelegator.java | 84 ---
.../InstanceStatusEventMessageListener.java | 84 ---
.../status/InstanceStatusEventMessageQueue.java | 45 --
.../controller/topology/TopologyBuilder.java | 27 +
.../topology/TopologyEventPublisher.java | 9 +
.../org/apache/stratos/common/Properties.java | 59 +-
.../org/apache/stratos/common/Property.java | 12 +-
.../org.apache.stratos.metadataservice/pom.xml | 2 +-
.../bean/util/converter/PojoConverter.java | 4 +-
.../pom.xml | 2 +-
37 files changed, 683 insertions(+), 1549 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/070f950b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
