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/9f7dbd0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9f7dbd0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9f7dbd0d Branch: refs/heads/master Commit: 9f7dbd0d86cc8215722af63cdeda9f36c5901956 Parents: 91c5a1a 68bfd33 Author: Melan Nimesh <[email protected]> Authored: Fri Jan 31 15:29:39 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Fri Jan 31 15:29:39 2014 +0530 ---------------------------------------------------------------------- tools/stratos-installer/README.txt | 38 +-- tools/stratos-installer/conf/setup.conf | 5 +- .../config/as/repository/conf/autoscaler.xml | 39 +++ .../stratos-installer/config/cc/bin/stratos.sh | 304 ------------------- .../cc/repository/conf/cloud-controller.xml | 6 - .../config/cc/repository/conf/jndi.properties | 2 +- .../repository/conf/cartridge-config.properties | 6 +- tools/stratos-installer/setup.sh | 48 ++- 8 files changed, 106 insertions(+), 342 deletions(-) ----------------------------------------------------------------------
