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/ecbd0769 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ecbd0769 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ecbd0769 Branch: refs/heads/master Commit: ecbd0769d8c8e0a5e0b02b1fb5eeeaa3bea07296 Parents: b5e7292 53f1fc8 Author: Melan Nimesh <[email protected]> Authored: Thu Feb 27 08:58:59 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Thu Feb 27 08:58:59 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 4 +- .../config/CartridgeAgentConfiguration.java | 13 ++- .../publisher/HealthStatisticsNotifier.java | 2 +- .../cartridge/agent/util/ExtensionUtils.java | 8 +- .../cli/commands/AutoscalePolicyCommand.java | 2 +- .../DescribeAutoScalingPolicyCommand.java | 2 +- .../DescribeDeploymentPolicyCommand.java | 2 +- .../stratos/cli/commands/ExitCommand.java | 2 +- .../stratos/cli/commands/SubscribeCommand.java | 10 +- .../UndeployCartridgeDefinitionCommand.java | 2 +- .../apache/stratos/cli/utils/CliConstants.java | 6 +- .../cloud/controller/pojo/Cartridge.java | 10 ++ .../controller/topology/TopologyBuilder.java | 53 +++++---- .../controller/util/CloudControllerUtil.java | 2 + .../balancer/cache/AlgorithmContextCache.java | 4 +- .../load/balancer/cache/LoadBalancerCache.java | 51 +++----- .../console/cartridge_info.jag | 2 - .../console/controllers/acs.jag | 6 +- .../console/controllers/loginSubmit.jag | 3 - .../console/controllers/manageTenants.jag | 5 +- .../console/controllers/profileClient.jag | 3 +- .../console/subscribe_cartridge.jag | 2 +- .../console/tenant_new.jag | 2 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../themes/theme1/partials/mycartridges.hbs | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 116 +++++++++++-------- .../themes/theme1/partials/tenant_new.hbs | 8 +- .../console/themes/theme1/renderers/login.js | 2 - .../console/themes/theme1/ui/css/main.css | 5 +- .../console/themes/theme1/ui/js/mycartridges.js | 2 +- .../console/themes/theme1/ui/js/popup.js | 1 + .../console/util/utility.jag | 47 +++++++- .../src/main/extensions/mount_volumes.sh | 5 +- tools/puppet3/manifests/nodes.pp | 37 +----- .../modules/agent/templates/bin/stratos.sh.erb | 3 + tools/puppet3/modules/nodejs/manifests/init.pp | 29 +++-- 36 files changed, 256 insertions(+), 199 deletions(-) ----------------------------------------------------------------------
