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/22ff4403 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/22ff4403 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/22ff4403 Branch: refs/heads/master Commit: 22ff44032e21be2cae824151ead8016fe58d2fa9 Parents: 64e500f 803e58c Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Jan 14 15:16:24 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Jan 14 15:16:24 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 17 ++++ .../controller/iaases/OpenstackNovaIaas.java | 9 +++ .../cloud/controller/iaases/VCloudIaas.java | 9 +++ .../impl/CloudControllerServiceImpl.java | 46 +++++------ .../cloud/controller/interfaces/Iaas.java | 5 ++ .../service/ServiceDeploymentManager.java | 16 ++-- .../rest/endpoint/services/ServiceUtils.java | 83 ++++++++++---------- 7 files changed, 113 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
