Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fac5d38c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fac5d38c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fac5d38c Branch: refs/heads/4.0.0-grouping Commit: fac5d38c2a8bc738dae69227b854930a1a26bae4 Parents: 8b493c6 3e32772 Author: Udara Liyanage <[email protected]> Authored: Wed Aug 20 11:00:11 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Aug 20 11:00:11 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 2 -- .../autoscaler/NetworkPartitionContext.java | 3 +- .../stratos/autoscaler/PartitionContext.java | 32 -------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 1 - .../cloud/controller/CloudControllerClient.java | 2 -- .../interfaces/AutoScalerServiceInterface.java | 2 -- .../AutoscalerHealthStatEventReceiver.java | 3 -- .../AutoscalerTopologyEventReceiver.java | 7 ++--- .../autoscaler/monitor/LbClusterMonitor.java | 2 -- .../partition/deployers/PartitionDeployer.java | 5 +-- .../deployers/DeploymentPolicyDeployer.java | 5 +-- .../rule/AutoscalerRuleEvaluator.java | 1 + .../stratos/autoscaler/util/AutoscalerUtil.java | 1 - .../axiom/FasterLookupDataHolderTest.java | 6 ---- .../algorithm/LoadBalanceAlgorithmFactory.java | 2 +- .../balancer/cache/AlgorithmContextCache.java | 3 +- .../conf/LoadBalancerConfiguration.java | 2 -- .../context/LoadBalancerContextUtil.java | 3 +- .../context/map/MemberIpHostnameMap.java | 3 +- .../TenantAwareLoadBalanceEndpoint.java | 2 +- .../InFlightRequestDecrementCallable.java | 2 +- .../InFlightRequestIncrementCallable.java | 2 +- .../org/apache/stratos/manager/dao/Cluster.java | 10 +++--- .../stratos/manager/deploy/service/Service.java | 4 +-- .../service/ServiceDeploymentManager.java | 3 +- .../service/multitenant/MultiTenantService.java | 4 +-- .../multitenant/lb/DefaultLBService.java | 3 +- .../multitenant/lb/ExistingLBService.java | 4 ++- .../service/multitenant/lb/LBService.java | 5 +-- .../multitenant/lb/MultiTenantLBService.java | 4 +-- .../multitenant/lb/ServiceAwareLBService.java | 4 ++- 31 files changed, 39 insertions(+), 93 deletions(-) ----------------------------------------------------------------------
