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/52d9b232 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/52d9b232 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/52d9b232 Branch: refs/heads/master Commit: 52d9b232c09417bfcc89247d42c6545bc6294e99 Parents: 6f7b219 4ae2f2b Author: Nirmal Fernando <[email protected]> Authored: Wed Apr 9 17:47:15 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Apr 9 17:47:15 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/wizardSubmit.jag | 94 +++++++++++--------- .../console/themes/theme1/pages/index.hbs | 2 - .../partials/configure_stratos_wizard.hbs | 76 ++++++++-------- .../theme1/partials/subscribe_cartridge.hbs | 26 ++++-- .../themes/theme1/partials/tenant_new.hbs | 2 +- .../console/themes/theme1/ui/js/wizard.js | 37 ++++++-- .../console/util/utility.jag | 3 + .../stratos/manager/deploy/service/Service.java | 27 ++++-- .../service/ServiceDeploymentManager.java | 10 +++ .../service/multitenant/MultiTenantService.java | 16 ---- .../multitenant/lb/MultiTenantLBService.java | 2 - .../lb/category/LoadBalancerCategory.java | 1 - .../ServiceLevelLoadBalancerCategory.java | 3 +- .../manager/CartridgeSubscriptionManager.java | 8 +- .../manager/utils/CartridgeConstants.java | 4 + 15 files changed, 187 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
