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/533665ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/533665ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/533665ae Branch: refs/heads/master Commit: 533665ae3883c6d8416e96a3d3362a8cb995cd4f Parents: 1c863d9 e98006b Author: Udara Liyanage <[email protected]> Authored: Mon Dec 16 19:46:49 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 16 19:46:49 2013 -0500 ---------------------------------------------------------------------- .../controller/topology/TopologyManager.java | 67 ++++---------------- .../controller/util/CloudControllerUtil.java | 5 +- .../stratos/messaging/domain/topology/Port.java | 5 ++ .../messaging/domain/topology/Service.java | 7 ++ .../messaging/domain/topology/Topology.java | 5 ++ 5 files changed, 32 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
