Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7701b25b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7701b25b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7701b25b Branch: refs/heads/master Commit: 7701b25b3a64e4ca57fcf282958cde18ed265615 Parents: 090ee3c b2f56c8 Author: Imesh Gunaratne <[email protected]> Authored: Tue Dec 3 16:57:13 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 16:57:13 2013 +0530 ---------------------------------------------------------------------- tools/stratos-installer/conf/setup.conf | 14 ++++ .../config/cep/repository/conf/jndi.properties | 13 ++++ tools/stratos-installer/setup.sh | 67 +++++++++++++++++++- tools/stratos-installer/start-servers.sh | 15 ++++- 4 files changed, 106 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
