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/55c43067 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/55c43067 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/55c43067 Branch: refs/heads/master Commit: 55c4306713c800b5658585b48a6b45163f524a71 Parents: 9ff9e2f 5d36e6b Author: Isuru <isu...@wso2.com> Authored: Thu Feb 13 17:38:57 2014 +0530 Committer: Isuru <isu...@wso2.com> Committed: Thu Feb 13 17:38:57 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 3 +- .../apache/stratos/cli/StratosApplication.java | 16 ++--- tools/stratos-installer/README.txt | 4 +- tools/stratos-installer/conf/setup.conf | 49 +------------ .../cc/repository/conf/cloud-controller.xml | 1 - .../repository/conf/cartridge-config.properties | 27 ------- tools/stratos-installer/ec2.sh | 12 ---- tools/stratos-installer/openstack.sh | 9 --- tools/stratos-installer/setup.sh | 75 ++++++-------------- 9 files changed, 36 insertions(+), 160 deletions(-) ----------------------------------------------------------------------
