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/a5304ee6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a5304ee6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a5304ee6 Branch: refs/heads/master Commit: a5304ee663dd3c99ba6f4fea7f215d5112225c03 Parents: 50d3566 15e5353 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Mon Mar 31 17:55:50 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Mon Mar 31 17:55:50 2014 +0530 ---------------------------------------------------------------------- products/stratos-manager/conf/log4j.properties | 6 +- tools/cartridge-create/README | 50 --- tools/cartridge-create/configure-software | 383 ------------------- tools/cartridge-create/create-kvm-image.sh | 24 -- tools/cartridge-create/image-action.sh | 165 -------- .../init-scripts/default/default | 43 --- .../init-scripts/default/default.ctrg | 51 --- .../init-scripts/default/get-launch-params.rb | 55 --- .../default/stratos-openstack-init.sh | 57 --- .../init-scripts/default/stratos.pem | 16 - .../init-scripts/mysql/ec2/get-launch-params.rb | 51 --- .../init-scripts/mysql/ec2/healthcheck.sh | 32 -- .../init-scripts/mysql/ec2/stratos-init.sh | 152 -------- .../init-scripts/mysql/get-launch-params.rb | 55 --- tools/cartridge-create/init-scripts/mysql/mysql | 46 --- .../init-scripts/mysql/mysql.ctrg | 58 --- .../mysql/openstack/get-launch-params.rb | 55 --- .../init-scripts/mysql/openstack/healthcheck.sh | 30 -- .../mysql/openstack/stratos-init.sh | 165 -------- .../init-scripts/mysql/stratos.pem | 16 - .../init-scripts/mysql/vcloud/stratos-init.sh | 152 -------- .../php/cartridge-data-publisher-1.0.2.zip | Bin 2832200 -> 0 bytes tools/cartridge-create/init-scripts/php/default | 59 --- .../init-scripts/php/default-ssl | 190 --------- .../init-scripts/php/ec2/get-launch-params.rb | 54 --- .../init-scripts/php/ec2/healthcheck.sh | 32 -- .../init-scripts/php/ec2/stratos-init.sh | 304 --------------- .../init-scripts/php/get-launch-params.rb | 55 --- .../php/openstack/get-launch-params.rb | 55 --- .../init-scripts/php/openstack/healthcheck.sh | 30 -- .../init-scripts/php/openstack/stratos-init.sh | 293 -------------- tools/cartridge-create/init-scripts/php/php | 49 --- .../cartridge-create/init-scripts/php/php.ctrg | 65 ---- .../init-scripts/php/thrift-0.8.0.tar.gz | Bin 2379006 -> 0 bytes .../cartridge-create/init-scripts/php/wso2.pem | 16 - tools/cartridge-create/init-scripts/php/x.sh | 50 --- tools/cartridge-create/init-scripts/php/y.sh | 32 -- .../init-scripts/tomcat/get-launch-params.rb | 53 --- .../tomcat/openstack/get-launch-params.rb | 55 --- .../tomcat/openstack/healthcheck.sh | 30 -- .../tomcat/openstack/stratos-init.sh | 289 -------------- .../init-scripts/tomcat/payload/README | 21 - .../init-scripts/tomcat/payload/launch-params | 18 - .../init-scripts/tomcat/stratos-init.sh | 274 ------------- .../init-scripts/tomcat/stratos.pem | 16 - tools/cartridge-create/stratos-image | 100 ----- tools/cartridge-create/stratos-image-local | 310 --------------- tools/cartridge-create/uploadimg.sh | 32 -- tools/puppet3-agent/config.sh | 6 +- tools/puppet3/manifests/nodes.pp | 30 +- 50 files changed, 9 insertions(+), 4171 deletions(-) ----------------------------------------------------------------------
