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/2fd5d40b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2fd5d40b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2fd5d40b Branch: refs/heads/master Commit: 2fd5d40bd3d30dd2601e4dee3dcd1f32bc3c73c7 Parents: 469a02a 0f819bb Author: Lahiru Sandaruwan <[email protected]> Authored: Sat Dec 28 00:42:33 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sat Dec 28 00:42:33 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/policy/model/LoadAverage.java | 5 + .../policy/model/MemoryConsumption.java | 5 + .../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 | 104 +++++++++----- .../integration/tests/LoginLogoutTestCase.java | 50 +++---- .../tests/SecurityVerificationTestCase.java | 8 +- .../tests/StratosManagerTestServerManager.java | 58 ++++---- .../integration/tests/TenantMgtTestCase.java | 112 +++++++-------- tools/puppet/manifests/classes/php_cartridge.pp | 2 + 25 files changed, 649 insertions(+), 596 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2fd5d40b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2fd5d40b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java ----------------------------------------------------------------------
