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/096398a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/096398a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/096398a5 Branch: refs/heads/master Commit: 096398a5d8179e75c53c2c60087779735063a403 Parents: 02bc1fd c03a42a Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 25 15:52:59 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 25 15:52:59 2013 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 4 +- .../internal/CloudControllerDSComponent.java | 2 +- .../topic/TopologySynchronizerTask.java | 64 ----------- .../InstanceStatusEventMessageDelegator.java | 68 ++++++++++++ .../InstanceStatusEventMessageListener.java | 43 ++++++++ .../status/InstanceStatusEventMessageQueue.java | 44 ++++++++ .../InstanceStatusEventMessageDelegator.java | 66 ----------- .../InstanceStatusEventMessageListener.java | 42 ------- .../controller/topology/TopologyBuilder.java | 68 ++++++------ .../controller/topology/TopologyManager.java | 109 +++++++++---------- .../topology/TopologySynchronizerTask.java | 62 +++++++++++ 11 files changed, 306 insertions(+), 266 deletions(-) ----------------------------------------------------------------------
