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/33c00334 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/33c00334 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/33c00334 Branch: refs/heads/master Commit: 33c00334b8fe0a2ae2d902fe90c39d61f03c0b91 Parents: 4b9f3ec 0b2e736 Author: Udara Liyanage <[email protected]> Authored: Tue Feb 18 01:41:59 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Feb 18 01:41:59 2014 -0500 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
