You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/04 09:27:32 UTC
[06/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into persistence
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/47e4f431
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/47e4f431
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/47e4f431
Branch: refs/heads/master
Commit: 47e4f43146999607f0f0b693eb0d9b0e3b376c02
Parents: c36bd25 06a7b57
Author: Isuru <is...@wso2.com>
Authored: Sun Dec 29 09:08:18 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sun Dec 29 09:08:18 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/MemberStatsContext.java | 18 +--
.../health/HealthEventMessageDelegator.java | 87 +++++++++---
.../autoscaler/policy/model/LoadAverage.java | 15 +-
.../policy/model/MemoryConsumption.java | 15 +-
.../autoscaler/rule/RuleTasksDelegator.java | 8 ++
.../stratos/autoscaler/TestRulesPackaged.java | 66 +++++++++
.../LoadBalancerStatisticsReader.java | 34 +++++
.../LoadBalancerStatisticsNotifier.java | 116 ++++++++++++++++
.../extension/api/LoadBalancerExtension.java | 14 +-
...oadBalancerInFlightRequestCountNotifier.java | 101 --------------
.../extension/api/LoadBalancerStatsReader.java | 34 -----
.../TenantAwareLoadBalanceEndpoint.java | 4 +-
.../internal/LoadBalancerServiceComponent.java | 19 +++
.../balancer/mediators/ResponseInterceptor.java | 4 +-
...adBalancerInFlightRequestCountCollector.java | 136 -------------------
.../LoadBalancerStatisticsCollector.java | 101 ++++++++++++++
.../WSO2CEPInFlightRequestCountObserver.java | 66 ---------
.../CompleteTopologyMessageProcessor.java | 2 +-
.../extension/HAProxyStatisticsReader.java | 96 +++++++++++++
.../haproxy/extension/HAProxyStatsReader.java | 96 -------------
.../apache/stratos/haproxy/extension/Main.java | 2 +-
.../distribution/src/main/conf/mincheck.drl | 10 +-
.../distribution/src/main/conf/scaling.drl | 95 +++++++++----
tools/puppet/manifests/classes/php_cartridge.pp | 2 +-
24 files changed, 625 insertions(+), 516 deletions(-)
----------------------------------------------------------------------