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/803e58cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/803e58cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/803e58cd Branch: refs/heads/master Commit: 803e58cd8a064ac13d7e363538a762951be66edf Parents: 3da6962 9e064c8 Author: Udara Liyanage <[email protected]> Authored: Tue Jan 14 14:02:04 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Jan 14 14:02:04 2014 -0500 ---------------------------------------------------------------------- .../autoscaler/algorithm/OneAfterAnother.java | 23 +- .../autoscaler/algorithm/RoundRobin.java | 16 +- .../health/AutoscalerHealthStatReceiver.java | 498 +++---------------- .../autoscaler/rule/RuleTasksDelegator.java | 3 - .../stratos/cartridge/agent/CartridgeAgent.java | 4 +- .../deployment/partition/Partition.java | 13 +- .../impl/CloudControllerServiceImpl.java | 45 +- .../controller/util/CloudControllerUtil.java | 17 +- .../console/config/acl.json | 4 + .../console/controllers/acs.jag | 4 + .../console/util/acl.jag | 53 ++ .../service/ServiceDeploymentManager.java | 16 +- .../messaging/domain/topology/Cluster.java | 6 + ...eCleanupClusterNotifierMessageProcessor.java | 55 ++ ...ceCleanupMemberNotifierMessageProcessor.java | 55 ++ ...InstanceCleanupNotifierMessageProcessor.java | 55 -- .../InstanceNotifierMessageProcessorChain.java | 14 +- .../rest/endpoint/services/ServiceUtils.java | 83 ++-- .../distribution/src/main/conf/scaling.drl | 7 +- .../distribution/src/main/assembly/bin.xml | 1 + .../pom.xml | 5 +- tools/puppet/manifests/classes/lb_cartridge.pp | 14 +- tools/puppet/manifests/classes/stratos.pp | 3 +- 23 files changed, 379 insertions(+), 615 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/803e58cd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
