Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos into 
apache


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8683ac9e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8683ac9e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8683ac9e

Branch: refs/heads/master
Commit: 8683ac9e59a71f98bda38f0d96081ae5c9228c3c
Parents: 6f29607 b3c2f4e
Author: Imesh Gunaratne <[email protected]>
Authored: Thu Nov 27 14:47:23 2014 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Thu Nov 27 14:47:23 2014 +0530

----------------------------------------------------------------------
 .../monitor/cluster/AbstractClusterMonitor.java |  11 +
 .../cluster/VMServiceClusterMonitor.java        |  11 +-
 .../rule/AutoscalerRuleEvaluator.java           |  14 +
 .../stratos/autoscaler/TestRulesPackaged.java   |   6 +
 .../stratos/load/balancer/ClusterContext.java   |  63 ---
 .../stratos/load/balancer/EndpointDeployer.java |  79 ----
 .../LoadBalancerTenantEventReceiver.java        | 219 ----------
 .../LoadBalancerTopologyEventReceiver.java      | 421 -------------------
 .../stratos/load/balancer/RequestDelegator.java | 137 ------
 .../stratos/load/balancer/ServiceContext.java   |  56 ---
 ...TenantAwareLoadBalanceEndpointException.java |  39 --
 .../load/balancer/context/ClusterContext.java   |  63 +++
 .../balancer/context/LoadBalancerContext.java   |   2 +-
 .../load/balancer/context/ServiceContext.java   |  58 +++
 .../context/map/ClusterIdClusterContextMap.java |   2 +-
 .../map/ServiceNameServiceContextMap.java       |   2 +-
 .../balancer/endpoint/EndpointDeployer.java     |  79 ++++
 .../balancer/endpoint/RequestDelegator.java     | 138 ++++++
 .../TenantAwareLoadBalanceEndpoint.java         |   1 -
 ...TenantAwareLoadBalanceEndpointException.java |  39 ++
 .../internal/LoadBalancerServiceComponent.java  |   8 +-
 .../LoadBalancerTenantEventReceiver.java        | 219 ++++++++++
 .../LoadBalancerTopologyEventReceiver.java      | 421 +++++++++++++++++++
 .../src/main/conf/drools/dependent-scaling.drl  | 153 +++++++
 .../src/main/conf/drools/scaling.drl            |  88 ++--
 25 files changed, 1262 insertions(+), 1067 deletions(-)
----------------------------------------------------------------------


Reply via email to