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/dc493ccf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dc493ccf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dc493ccf Branch: refs/heads/master Commit: dc493ccf289e8bc9ce97785b94fe94b04596a7e0 Parents: b8559dd 2bc47a0 Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 18 14:44:13 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 18 14:44:13 2013 +0530 ---------------------------------------------------------------------- .../src/conf/cartridge-config.properties | 64 ----- .../manager/CartridgeSubscriptionManager.java | 9 +- .../service/ApplicationManagementService.java | 35 +-- .../utils/CartridgeSubscriptionUtils.java | 34 +++ .../stratos/autoscaler/AutoscalerContext.java | 8 + .../stratos/autoscaler/ClusterMonitor.java | 251 ----------------- .../stratos/autoscaler/LbClusterMonitor.java | 226 ---------------- .../health/HealthEventMessageDelegator.java | 25 +- .../autoscaler/monitor/AbstractMonitor.java | 44 +++ .../autoscaler/monitor/ClusterMonitor.java | 270 +++++++++++++++++++ .../autoscaler/monitor/LbClusterMonitor.java | 245 +++++++++++++++++ .../autoscaler/policy/PolicyManager.java | 2 +- .../topology/AutoscalerTopologyReceiver.java | 2 + .../stratos/autoscaler/util/AutoscalerUtil.java | 3 + .../balancer/LoadBalancerTenantReceiver.java | 37 ++- .../TopologyFilterConfigurator.java | 9 + .../internal/LoadBalancerServiceComponent.java | 11 + .../src/main/conf/cartridge-config.properties | 5 +- 18 files changed, 690 insertions(+), 590 deletions(-) ----------------------------------------------------------------------
