Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/880c346a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/880c346a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/880c346a Branch: refs/heads/master Commit: 880c346a1a3ca831158ce4a0c3003f74276c5baa Parents: 790b2ea ba1fe83 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 19 12:50:55 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 19 12:50:55 2013 +0530 ---------------------------------------------------------------------- .../stratos/adc/mgt/deploy/service/Service.java | 5 +- .../service/ServiceDeploymentManager.java | 15 +- .../service/multitenant/MultiTenantService.java | 5 +- .../mgt/listener/InstanceStatusListener.java | 19 +- .../manager/CartridgeSubscriptionManager.java | 12 ++ .../adc/mgt/utils/PersistenceManager.java | 42 ++++ .../java/org/apache/stratos/cli/RestClient.java | 16 +- .../stratos/cli/RestCommandLineService.java | 34 +-- .../rest/endpoint/services/ServiceUtils.java | 17 +- .../extension/FaultHandlingWindowProcessor.java | 6 +- .../cartridge-agent/ec2/php/cartridge-agent.sh | 12 +- .../subscriber/CartridgeAgentConstants.java | 5 + .../cartridge/agent/event/subscriber/Main.java | 207 ++++++++++++++----- .../puppet/etc/puppet/files/cartridge-agent.sh | 12 +- 14 files changed, 297 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
