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/cdccf849 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cdccf849 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cdccf849 Branch: refs/heads/master Commit: cdccf84998f339517e75cda573fbd6fccce848cb Parents: 7e4d597 ca21110 Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 17 09:52:37 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 17 09:52:37 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 169 ++++--- .../autoscaler/NetworkPartitionLbHolder.java | 496 +++++++++++++++++++ .../stratos/autoscaler/PartitionContext.java | 10 + .../autoscaler/api/AutoScalerServiceImpl.java | 28 +- .../internal/AutoscalerServerComponent.java | 10 +- .../health/AutoscalerHealthStatReceiver.java | 24 +- .../topology/AutoscalerTopologyReceiver.java | 4 +- .../autoscaler/monitor/ClusterMonitor.java | 1 + .../autoscaler/partition/PartitionManager.java | 37 +- .../autoscaler/registry/RegistryManager.java | 41 +- .../rule/AutoscalerRuleEvaluator.java | 10 +- .../autoscaler/rule/RuleTasksDelegator.java | 26 +- .../autoscaler/util/AutoScalerConstants.java | 2 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 26 +- .../status/InstanceStatusEventMessageQueue.java | 2 +- .../conf/LoadBalancerConfiguration.java | 4 +- .../manager/CartridgeSubscriptionManager.java | 4 +- .../filter/topology/TopologyClusterFilter.java | 2 +- .../filter/topology/TopologyMemberFilter.java | 2 +- .../filter/topology/TopologyServiceFilter.java | 2 +- .../message/receiver/tenant/TenantManager.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 9 +- .../distribution/src/main/conf/scaling.drl | 2 +- tools/stratos-installer/README.txt | 24 +- 24 files changed, 733 insertions(+), 204 deletions(-) ----------------------------------------------------------------------
