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/6029d2bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6029d2bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6029d2bb Branch: refs/heads/master Commit: 6029d2bb459daad4ef3de2aa57cbb264482deaaf Parents: 98ac81d da3cd1d Author: Udara Liyanage <[email protected]> Authored: Tue Dec 3 12:23:36 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 3 12:23:36 2013 -0500 ---------------------------------------------------------------------- tools/stratos-installer/conf/setup.conf | 4 +- .../config/cc/repository/conf/jndi.properties | 4 ++ tools/stratos-installer/setup.sh | 68 ++------------------ tools/stratos-installer/start-servers.sh | 2 +- 4 files changed, 14 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
