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/4b95ade5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4b95ade5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4b95ade5 Branch: refs/heads/master Commit: 4b95ade569b32d71cceffe6538a9c0cc4b1c8c50 Parents: d2718c1 3779ee9 Author: Melan Nimesh <[email protected]> Authored: Mon Feb 17 11:59:06 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Mon Feb 17 11:59:06 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 51 +++++---- .../controller/iaases/OpenstackNovaIaas.java | 8 ++ .../util/CloudControllerConstants.java | 1 + .../theme1/renderers/configure_stratos.js | 1 - .../renderers/configure_stratos_wizard.js | 1 - .../console/util/utility.jag | 6 +- .../behaviour/CartridgeMgtBehaviour.java | 46 ++++++++ .../subscription/CartridgeSubscription.java | 26 ++--- .../subscription/DataCartridgeSubscription.java | 5 +- .../ServiceDeploymentMultiTenantBehaviour.java | 109 ------------------- .../SubscriptionMultiTenantBehaviour.java | 50 +++++---- .../SubscriptionSingleTenantBehaviour.java | 67 ++++++------ .../tenancy/SubscriptionTenancyBehaviour.java | 20 +++- .../utils/CartridgeSubscriptionUtils.java | 36 +++--- .../rest/endpoint/bean/CartridgeInfoBean.java | 8 +- .../rest/endpoint/services/ServiceUtils.java | 4 +- pom.xml | 2 +- 17 files changed, 197 insertions(+), 244 deletions(-) ----------------------------------------------------------------------
