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/984a9d4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/984a9d4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/984a9d4d Branch: refs/heads/master Commit: 984a9d4d0236705cc624df0ac93bdd6f6872986e Parents: 06fb5ea 0b2e736 Author: Melan Nimesh <[email protected]> Authored: Tue Feb 18 11:28:27 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Tue Feb 18 11:28:27 2014 +0530 ---------------------------------------------------------------------- .../controller/iaases/OpenstackNovaIaas.java | 23 ++- .../impl/CloudControllerServiceImpl.java | 169 +++++++++++++------ .../cloud/controller/pojo/ClusterContext.java | 53 ++---- .../stratos/cloud/controller/pojo/Volume.java | 45 ++++- .../OpenstackNovaPartitionValidator.java | 8 +- .../main/resources/CloudControllerService.wsdl | 2 + 6 files changed, 203 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
