Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into cluster_id_multiple_subscriptions
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ba477892 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba477892 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba477892 Branch: refs/heads/master Commit: ba477892b84548863257cb492884a897ab9dce14 Parents: f0e04b5 93fbed7 Author: Isuru <[email protected]> Authored: Wed Jan 8 17:49:06 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Jan 8 17:49:06 2014 +0530 ---------------------------------------------------------------------- .../cartridge_deployments.jag | 4 +- .../org.apache.stratos.manager.console/lbs.jag | 4 +- .../mt_service_deployments.jag | 4 +- .../policy_deployments.jag | 4 +- .../theme1/partials/cartridge_deployments.hbs | 90 ++++++++++++++++++++ .../themes/theme1/partials/lbs.hbs | 90 ++++++++++++++++++++ .../theme1/partials/mt_service_deployments.hbs | 90 ++++++++++++++++++++ .../theme1/partials/policy_deployments.hbs | 90 ++++++++++++++++++++ .../theme1/renderers/cartridge_deployments.js | 25 ++++-- .../themes/theme1/renderers/lbs.js | 25 ++++-- .../theme1/renderers/mt_service_deployments.js | 25 ++++-- .../theme1/renderers/policy_deployments.js | 21 +++-- 12 files changed, 434 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
