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/edfc3c42 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/edfc3c42 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/edfc3c42 Branch: refs/heads/master Commit: edfc3c425cef9f87f959e8f6681d6bcd06d02826 Parents: 166943f bf3895f Author: Isuru <[email protected]> Authored: Thu Jan 16 16:02:46 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Jan 16 16:02:46 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 19 +- .../stratos/autoscaler/PartitionContext.java | 29 +- .../autoscaler/algorithm/OneAfterAnother.java | 18 +- .../autoscaler/algorithm/RoundRobin.java | 49 +- .../stratos/cli/commands/AddTenantCommand.java | 8 +- .../AutoscalingPolicyDeploymentCommand.java | 2 +- .../commands/CartridgeDeploymentCommand.java | 2 +- .../DeploymentPolicyDeploymentCommand.java | 2 +- .../commands/PartitionDeploymentCommand.java | 2 +- .../console/config/acl.json | 10 +- .../console/configure_stratos_wizard.jag | 28 + .../console/console.ipr | 59 + .../console/console.iws | 719 ++++++ .../console/controllers/router.jag | 4 + .../console/data/config_status.json | 2 +- .../console/data/tenants.json | 19 + .../console/tenant_management.jag | 11 + .../console/tenant_new.jag | 11 + .../partials/configure_stratos_wizard.hbs | 87 + .../console/themes/theme1/partials/header.hbs | 212 +- .../themes/theme1/partials/mycartridges.hbs | 30 + .../theme1/partials/tenant_management.hbs | 92 + .../themes/theme1/partials/tenant_new.hbs | 67 + .../renderers/configure_stratos_wizard.js | 75 + .../console/themes/theme1/renderers/index.js | 66 +- .../theme1/renderers/tenant_management.js | 42 + .../themes/theme1/renderers/tenant_new.js | 42 + .../console/themes/theme1/theme.js | 37 +- .../console/themes/theme1/ui/css/bootstrap.css | 2337 ++++++++++-------- .../console/themes/theme1/ui/css/main.css | 116 +- .../themes/theme1/ui/js/tenant_management.js | 30 + .../console/themes/theme1/ui/js/wizard.js | 18 + .../console/util/acl.jag | 31 +- .../distribution/src/main/conf/mincheck.drl | 4 +- 34 files changed, 3120 insertions(+), 1160 deletions(-) ----------------------------------------------------------------------
