Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into products
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3a5b5d05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3a5b5d05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3a5b5d05 Branch: refs/heads/master Commit: 3a5b5d056df27238d769d058c7f703c9717504a5 Parents: d03c2f4 cebf4a2 Author: Isuru <[email protected]> Authored: Thu Dec 12 15:29:22 2013 +0530 Committer: Isuru <[email protected]> Committed: Thu Dec 12 15:29:22 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 +- .../apache/stratos/cli/CartridgeInfoBean.java | 18 ++++ .../stratos/cli/RestCommandLineService.java | 12 ++- .../apache/stratos/cli/StratosApplication.java | 11 +++ .../stratos/cli/commands/SubscribeCommand.java | 54 +++++++++--- .../apache/stratos/cli/utils/CliConstants.java | 24 ++++-- .../impl/CloudControllerServiceImpl.java | 4 +- .../topology/TopologyEventSender.java | 4 +- .../bean/util/converter/PojoConverter.java | 4 +- .../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 ++- 21 files changed, 223 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
