Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9fab6277 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9fab6277 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9fab6277 Branch: refs/heads/master Commit: 9fab6277660e6e6a889e734f487449a757237825 Parents: ddb95c1 57dc767 Author: Gourav Shenoy <[email protected]> Authored: Tue May 2 15:58:37 2017 -0400 Committer: Gourav Shenoy <[email protected]> Committed: Tue May 2 15:58:37 2017 -0400 ---------------------------------------------------------------------- .../testing-0.17/group_vars/all/vars.yml | 1 + .../templates/airavata-server.properties.j2 | 26 +++++++++++++++++++- dev-tools/ansible/roles/database/vars/main.yml | 2 ++ .../main/resources/airavata-server.properties | 2 ++ .../org/apache/airavata/server/ServerMain.java | 2 +- 5 files changed, 31 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
