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/2e8e3033 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2e8e3033 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2e8e3033 Branch: refs/heads/master Commit: 2e8e3033a4b5756a197441fb10ac98918f81776e Parents: e308ae5 0bb15d1 Author: Isuru <[email protected]> Authored: Mon Feb 17 19:41:10 2014 +0530 Committer: Isuru <[email protected]> Committed: Mon Feb 17 19:41:10 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 6 +-- .../publisher/CartridgeAgentEventPublisher.java | 28 +++++++++++++ .../stratos/cli/RestCommandLineService.java | 4 +- .../cli/beans/cartridge/CartridgeInfoBean.java | 9 ++++ .../stratos/cli/commands/SubscribeCommand.java | 22 +++++++++- .../apache/stratos/cli/utils/CliConstants.java | 3 ++ .../impl/CloudControllerServiceImpl.java | 8 +++- .../InstanceStatusEventMessageDelegator.java | 6 +++ .../controller/topology/TopologyBuilder.java | 44 +++++++++++++++++++- .../topology/TopologyEventPublisher.java | 11 ++++- .../controllers/cartridgeSubscribeSubmit.jag | 4 +- .../theme1/partials/subscribe_cartridge.hbs | 14 ++----- .../messaging/domain/topology/MemberStatus.java | 3 +- .../topology/MemberReadyToShutdownEvent.java | 18 ++++++++ 14 files changed, 157 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
