You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2014/06/30 22:16:44 UTC
[5/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos into pr-1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos into pr-1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5e548002
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5e548002
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5e548002
Branch: refs/heads/master
Commit: 5e548002d0c98e745a631de5fda745409d66c32f
Parents: e89996f 3db4b21
Author: Chris Snow <ch...@apache.org>
Authored: Mon Jun 30 20:15:29 2014 +0000
Committer: Chris Snow <ch...@apache.org>
Committed: Mon Jun 30 20:15:29 2014 +0000
----------------------------------------------------------------------
README.md | 4 +-
.../AutoscalerTopologyEventReceiver.java | 52 +++++
.../internal/CloudControllerDSComponent.java | 2 +-
.../CartridgeInstanceDataPublisher.java | 121 +++++------
.../controller/topology/TopologyBuilder.java | 4 +-
.../LoadBalancerTopologyEventReceiver.java | 216 ++++++++++++++++---
.../conf/LoadBalancerConfiguration.java | 14 ++
.../load/balancer/conf/util/Constants.java | 1 +
.../balancer/context/LoadBalancerContext.java | 8 +
.../TenantAwareLoadBalanceEndpoint.java | 4 +-
.../balancer/mediators/LocationReWriter.java | 53 +++--
.../stratos/load/balancer/util/Constants.java | 2 +-
.../test/LoadBalancerConfigurationTest.java | 11 +-
.../sample/configuration/loadbalancer1.conf | 6 +
.../sample/configuration/loadbalancer2.conf | 6 +
.../sample/configuration/loadbalancer3.conf | 6 +
.../ClusterRemovedMessageProcessor.java | 8 +-
.../MemberTerminatedMessageProcessor.java | 6 +-
.../ServiceRemovedMessageProcessor.java | 7 +-
.../executionplans/AverageHeathRequest.xml | 33 ++-
.../AverageInFlightRequestsFinder.xml | 13 +-
.../executionplans/GradientOfHealthRequest.xml | 32 ++-
.../GradientOfRequestsInFlightFinder.xml | 17 +-
.../SecondDerivativeOfHealthRequest.xml | 30 ++-
...SecondDerivativeOfRequestsInFlightFinder.xml | 14 +-
.../cep/extension/ConcatWindowProcessor.java | 54 +++++
.../src/main/conf/loadbalancer.conf | 6 +
.../src/main/conf/siddhi/siddhi.extension | 1 +
28 files changed, 577 insertions(+), 154 deletions(-)
----------------------------------------------------------------------