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/64138106 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/64138106 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/64138106 Branch: refs/heads/master Commit: 6413810613fff3b9db31ce9fb5277d95f51f41c3 Parents: 20a61a9 2e8e303 Author: Melan Nimesh <[email protected]> Authored: Mon Feb 17 19:43:29 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Mon Feb 17 19:43:29 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 6 +-- .../agent/data/publisher/DataPublisher.java | 6 +-- .../data/publisher/GenericDataPublisher.java | 29 +++++++++++++ .../publisher/CartridgeAgentEventPublisher.java | 28 +++++++++++++ .../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 ++++++++ 11 files changed, 146 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
