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/a4096291 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a4096291 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a4096291 Branch: refs/heads/master Commit: a409629111a79c1a47180ce6ab5fd32c3fe82bee Parents: 1bae29e 774cae9 Author: Udara Liyanage <[email protected]> Authored: Mon Feb 17 10:18:09 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Feb 17 10:18:09 2014 -0500 ---------------------------------------------------------------------- .../agent/data/publisher/DataPublisher.java | 6 +- .../data/publisher/GenericDataPublisher.java | 29 +++++++ .../controllers/cartridgeSubscribeSubmit.jag | 4 +- .../theme1/partials/subscribe_cartridge.hbs | 14 +--- .../status/InstanceMaintenanceModeEvent.java | 59 +++++++++++++++ .../topology/MemberMaintenanceModeEvent.java | 79 ++++++++++++++++++++ 6 files changed, 174 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
