Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into service_aware_lb
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/28df667d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/28df667d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/28df667d Branch: refs/heads/master Commit: 28df667d1d6f441c0157976700825a968378dfe5 Parents: f2e441c 52d9b23 Author: Isuru <[email protected]> Authored: Wed Apr 9 19:06:30 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Apr 9 19:06:30 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 + .../broker/subscribe/TopicSubscriber.java | 15 +++- 8 files changed, 158 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
