Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/85abff74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/85abff74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/85abff74 Branch: refs/heads/master Commit: 85abff74dae74db85b6d4c69f7d71bb99fe2ae13 Parents: 749d1d1 ba3b50c Author: Isuru <[email protected]> Authored: Wed Dec 11 01:39:17 2013 +0530 Committer: Isuru <[email protected]> Committed: Wed Dec 11 01:39:17 2013 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 10 -------- .../controller/iaases/OpenstackNovaIaas.java | 26 +++----------------- .../messaging/domain/topology/Cluster.java | 10 +++++++- .../rest/endpoint/services/ServiceUtils.java | 3 +-- 4 files changed, 13 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/85abff74/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ----------------------------------------------------------------------
