Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_cleanup_task
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b0632d43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b0632d43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b0632d43 Branch: refs/heads/master Commit: b0632d439df7872df6fc89a7a2b2adf75f24c84c Parents: 6d6ecbf c257ac8 Author: Isuru <[email protected]> Authored: Sat Feb 8 23:47:17 2014 +0530 Committer: Isuru <[email protected]> Committed: Sat Feb 8 23:47:17 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 29 +-- .../topology/AutoscalerTopologyReceiver.java | 60 +++--- .../controller/deployers/CartridgeDeployer.java | 213 ------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 121 +++++------ .../controller/iaases/OpenstackNovaIaas.java | 114 +++++----- .../cloud/controller/iaases/VCloudIaas.java | 53 ++--- .../impl/CloudControllerServiceImpl.java | 68 +++--- .../cloud/controller/interfaces/Iaas.java | 51 +++-- .../cloud/controller/pojo/ClusterContext.java | 12 +- .../cloud/controller/pojo/IaasProvider.java | 5 +- .../cloud/controller/pojo/MemberContext.java | 39 ++++ .../runtime/FasterLookUpDataHolder.java | 3 + .../controller/topology/TopologyBuilder.java | 5 +- .../topology/TopologyEventPublisher.java | 2 +- .../controller/util/CloudControllerUtil.java | 30 +++ .../validate/AWSEC2PartitionValidator.java | 11 +- .../OpenstackNovaPartitionValidator.java | 10 +- .../model/TopologyClusterInformationModel.java | 3 +- .../rest/endpoint/bean/topology/Cluster.java | 10 +- .../rest/endpoint/services/ServiceUtils.java | 2 +- .../rest/endpoint/services/StratosAdmin.java | 9 + .../pom.xml | 4 +- pom.xml | 2 +- 23 files changed, 377 insertions(+), 479 deletions(-) ----------------------------------------------------------------------
