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/06a7b574 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/06a7b574 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/06a7b574 Branch: refs/heads/master Commit: 06a7b5744859a9e08b5308596b8f2b35d7d2da8b Parents: b5e91f4 945f333 Author: Isuru <[email protected]> Authored: Sun Dec 29 08:57:06 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 29 08:57:06 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 +++++++++---- 23 files changed, 624 insertions(+), 515 deletions(-) ----------------------------------------------------------------------
