You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/09/06 07:56:19 UTC
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/8b9c95dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8b9c95dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8b9c95dd
Branch: refs/heads/master
Commit: 8b9c95dda0f01bdf6ed83636255f417ca4efcdc6
Parents: 398caea 7b141e3
Author: Isuru <is...@wso2.com>
Authored: Fri Sep 6 10:51:12 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Sep 6 10:51:12 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 6 +
.../distribution/src/main/assembly/bin.xml | 4 -
.../distribution/src/main/resources/stratos.sh | 1 -
.../cloud-controller/modules/p2-profile/pom.xml | 176 ++-----------------
tools/stratos-installer/README.txt | 84 +++++----
.../cartridges/ec2/ec2-mysql.xml | 36 ++++
.../cartridges/ec2/ec2-php.xml | 35 ++++
.../cartridges/ec2/ec2-tomcat.xml | 35 ++++
.../cartridges/ec2/ec2_mysql.xml | 36 ----
.../cartridges/ec2/ec2_php.xml | 35 ----
.../cartridges/ec2/ec2_tomcat.xml | 35 ----
tools/stratos-installer/clean.sh | 12 +-
tools/stratos-installer/conf/setup.conf | 20 +--
.../repository/conf/etc/cassandra-component.xml | 28 +--
.../config/is/repository/conf/tenant-mgt.xml | 16 +-
.../sc/repository/conf/etc/logging-config.xml | 15 +-
tools/stratos-installer/ec2-cartridge.sh | 66 +++----
tools/stratos-installer/setup.sh | 5 +-
18 files changed, 256 insertions(+), 389 deletions(-)
----------------------------------------------------------------------