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/bcc20381 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bcc20381 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bcc20381 Branch: refs/heads/master Commit: bcc20381647c809f4578a38744848c3789279288 Parents: ff50a0e 78d4c84 Author: Udara Liyanage <[email protected]> Authored: Mon Feb 17 06:25:37 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Feb 17 06:25:37 2014 -0500 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 460 +++++++++---------- .../cloud/controller/iaases/AWSEC2Iaas.java | 51 +- .../controller/iaases/OpenstackNovaIaas.java | 16 +- .../impl/CloudControllerServiceImpl.java | 43 +- .../cloud/controller/pojo/ClusterContext.java | 16 +- .../util/CloudControllerConstants.java | 1 + .../stratos/messaging/util/Constants.java | 1 + pom.xml | 2 +- 8 files changed, 321 insertions(+), 269 deletions(-) ----------------------------------------------------------------------
