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/f6ce4cea Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6ce4cea Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6ce4cea Branch: refs/heads/master Commit: f6ce4ceac27db186ee3117ef177c44f635c6e0dc Parents: 76a079e a2f3933 Author: Pradeep Fernando <[email protected]> Authored: Wed Apr 30 16:05:09 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Apr 30 16:05:09 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 54 ++++++++++++-------- .../controller/util/CloudControllerUtil.java | 4 +- 2 files changed, 36 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
