Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c76076eb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c76076eb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c76076eb Branch: refs/heads/master Commit: c76076eb8e896a17fe4857aedbc8d9c626aa9a30 Parents: e7a3c27 f3653d3 Author: Chamila de Alwis <[email protected]> Authored: Sun Oct 26 17:13:21 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sun Oct 26 17:13:21 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 23 +- .../autoscaler/api/AutoScalerServiceImpl.java | 18 +- .../interfaces/AutoScalerServiceInterface.java | 4 + .../monitor/ClusterMonitorFactory.java | 2 +- .../monitor/KubernetesClusterMonitor.java | 13 +- .../KubernetesServiceClusterMonitor.java | 11 +- .../autoscaler/monitor/VMLbClusterMonitor.java | 4 +- .../monitor/VMServiceClusterMonitor.java | 4 +- .../autoscaler/policy/PolicyManager.java | 67 +- .../autoscaler/util/AutoScalerConstants.java | 6 +- .../stratos/cli/RestCommandLineService.java | 23 +- .../apache/stratos/cli/StratosApplication.java | 8 +- .../UpdateAutoscalingPolicyCommand.java | 122 ++ .../commands/UpdateDeploymentPolicyCommand.java | 122 ++ .../impl/CloudControllerServiceImpl.java | 174 +- .../InstanceStatusEventMessageListener.java | 4 +- .../controller/topology/TopologyBuilder.java | 46 +- .../common/constants/StratosConstants.java | 6 +- .../kubernetes/client/KubernetesApiClient.java | 39 +- .../KubernetesAPIClientInterface.java | 4 +- .../stratos/kubernetes/client/model/State.java | 14 +- .../client/rest/KubernetesResponseHandler.java | 10 +- .../kubernetes/client/rest/RestClient.java | 42 +- .../org.apache.stratos.load.balancer/pom.xml | 6 +- .../manager/client/AutoscalerServiceClient.java | 12 + .../topology/TopologyEventMessageListener.java | 71 +- .../policy/deployment/DeploymentPolicy.java | 50 +- .../bean/util/converter/PojoConverter.java | 18 +- .../stratos/rest/endpoint/mock/MockContext.java | 14 +- .../rest/endpoint/services/ServiceUtils.java | 57 +- .../rest/endpoint/services/StratosAdmin.java | 28 +- .../load-balancer/modules/distribution/pom.xml | 21 + .../distribution/src/main/assembly/bin.xml | 14 + .../src/main/conf/mqtttopic.properties | 21 + .../distribution/src/main/conf/autoscaler.xml | 21 +- .../src/main/conf/drools/container-scaling.drl | 8 +- .../src/main/resources/AutoScalerService.wsdl | 1554 ++++++++++-------- .../lib/puppet/parser/functions/difference.rb | 17 + .../all/repository/conf/cloud-controller.xml | 4 +- .../cc/repository/conf/cloud-controller.xml | 4 +- 40 files changed, 1619 insertions(+), 1067 deletions(-) ----------------------------------------------------------------------
