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/03ff8797 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/03ff8797 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/03ff8797 Branch: refs/heads/master Commit: 03ff87973006168642a96edc433b994a301cb8f8 Parents: c237127 2954a0d Author: Udara Liyanage <[email protected]> Authored: Thu Nov 14 11:41:13 2013 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Nov 14 11:41:13 2013 +0530 ---------------------------------------------------------------------- .../factory/CartridgeSubscriptionFactory.java | 9 ++--- .../adc/mgt/test/CartridgeSubscriptionTest.java | 6 +-- .../controller/topology/TopologyBuilder.java | 11 +++++- .../messaging/domain/topology/Member.java | 9 +++++ .../event/topology/InstanceSpawnedEvent.java | 40 +++++--------------- .../topology/InstanceSpawnedEventProcessor.java | 4 +- 6 files changed, 39 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
