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/3999dc5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3999dc5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3999dc5d Branch: refs/heads/master Commit: 3999dc5d5d6ec4b3d9efa4f4a4ff90978159872c Parents: 0aee220 704661a Author: Udara Liyanage <[email protected]> Authored: Thu Feb 13 05:03:04 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Feb 13 05:03:04 2014 -0500 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 8 +- .../stratos/cli/beans/cartridge/Cartridge.java | 9 + .../partials/configure_stratos_wizard.hbs | 747 ++++++++++--------- .../console/themes/theme1/partials/header.hbs | 58 +- .../renderers/configure_stratos_wizard.js | 5 +- .../console/themes/theme1/ui/js/wizard.js | 2 +- .../console/util/utility.jag | 2 +- .../stratos/rest/endpoint/mock/MockContext.java | 4 + .../rest/endpoint/mock/StratosTestAdmin.java | 11 + .../distribution/src/main/bin/stratos.sh | 2 +- .../puppet/etc/puppet/files/cartridge-agent.sh | 13 + tools/puppet/manifests/classes/lb_cartridge.pp | 10 +- tools/puppet/manifests/classes/mysql.pp | 4 +- tools/puppet/manifests/classes/php_cartridge.pp | 12 +- tools/puppet/manifests/nodes.pp | 86 ++- tools/stratos-installer/README.txt | 13 +- tools/stratos-installer/conf/setup.conf | 3 +- .../config/cep/repository/conf/jndi.properties | 16 +- tools/stratos-installer/setup.sh | 5 + 19 files changed, 558 insertions(+), 452 deletions(-) ----------------------------------------------------------------------
