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/b4de7ba7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b4de7ba7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b4de7ba7 Branch: refs/heads/master Commit: b4de7ba76eca54ff3a7e17c52a0965e7e7e87f0c Parents: c8a0c1f f252644 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 25 16:14:51 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 25 16:14:51 2013 +0530 ---------------------------------------------------------------------- .../parser/CloudControllerConfigParser.java | 5 +++ .../impl/CloudControllerServiceImpl.java | 37 +++++++++++--------- .../topology/TopologySynchronizerTask.java | 19 ++++++---- 3 files changed, 38 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
