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/d7015680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d7015680
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d7015680

Branch: refs/heads/master
Commit: d7015680efdbe8c47fb81512e2371aa39891fd44
Parents: 5a8ebb0 b60d2c7
Author: Nirmal Fernando <[email protected]>
Authored: Tue Dec 3 17:00:20 2013 +0000
Committer: Nirmal Fernando <[email protected]>
Committed: Tue Dec 3 17:00:20 2013 +0000

----------------------------------------------------------------------
 .../cartridge-agent/ec2/php/cartridge-agent.sh  |   4 +-
 .../ec2/tomcat/cartridge-agent.sh               |   4 +-
 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 0 -> 2832200 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 0 -> 2379006 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/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 --
 96 files changed, 4140 insertions(+), 4144 deletions(-)
----------------------------------------------------------------------


Reply via email to