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/0e94cb7e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0e94cb7e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0e94cb7e Branch: refs/heads/master Commit: 0e94cb7edf97eb2f6e1c027b38db26258335022e Parents: bebab46 7c51d04 Author: Nirmal Fernando <[email protected]> Authored: Wed Dec 4 22:58:22 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Dec 4 22:58:22 2013 +0530 ---------------------------------------------------------------------- .../mgt/listener/InstanceStatusListener.java | 60 ++-- .../stratos/autoscaler/AutoscalerContext.java | 2 +- .../statistics/WSO2CEPStatsPublisher.java | 10 +- .../load/balancer/LoadBalancerContext.java | 2 +- .../internal/LoadBalancerServiceComponent.java | 7 +- .../broker/publish/TopicPublisher.java | 2 +- .../stream-manager-config.xml | 163 +++++++++ .../cartridge-agent/ec2/php/cartridge-agent.sh | 75 +--- .../git/impl/GitBasedArtifactRepository.java | 21 ++ .../event/subscriber/ArtifactListener.java | 57 ++- .../subscriber/CartridgeAgentConstants.java | 3 + .../event/subscriber/LaunchParamsUtil.java | 58 +++ .../cartridge/agent/event/subscriber/Main.java | 22 +- .../pom.xml | 131 +++++++ .../src/main/resources/AutoScalerService.wsdl | 359 +++++++++++++++++++ 15 files changed, 823 insertions(+), 149 deletions(-) ----------------------------------------------------------------------
