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/bc375af1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bc375af1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bc375af1 Branch: refs/heads/master Commit: bc375af1377ced337d6f4149f33b0657bb342f7b Parents: a74f431 41c048e Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 15:07:58 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 15:07:58 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 6 +- .../adc/mgt/client/CartridgeAgentClient.java | 4 +- .../client/CloudControllerServiceClient.java | 2 +- .../mgt/publisher/TenantSynzhronizerTask.java | 4 +- .../adc/mgt/utils/CartridgeConstants.java | 3 +- .../org.apache.stratos.autoscaler/pom.xml | 4 +- .../src/main/resources/META-INF/component.xml | 5 +- .../impl/CloudControllerServiceImpl.java | 4 +- .../topology/TopologyEventSender.java | 4 +- .../ServiceCreatedMessageProcessor.java | 1 + .../AverageInFlightRequestsFinder.xml | 2 +- .../GradientOfRequestsInFlightFinder.xml | 2 +- ...SecondDerivativeOfRequestsInFlightFinder.xml | 2 +- .../ec2/load-balancer/cartridge-agent.sh | 89 ++++++++++++++++++++ .../ec2/load-balancer/start-load-balancer.sh | 7 ++ .../templates/loadbalancer.conf.template | 10 ++- 16 files changed, 129 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
