Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4b0a9ecb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4b0a9ecb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4b0a9ecb Branch: refs/heads/master Commit: 4b0a9ecb9ccf34757602dd2d7c7f1156ec4aeac7 Parents: e6eb0c9 b5984b0 Author: scnakandala <[email protected]> Authored: Tue May 2 16:43:47 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue May 2 16:43:47 2017 -0400 ---------------------------------------------------------------------- .../roles/api-orch/templates/airavata-server.properties.j2 | 2 +- modules/distribution/pom.xml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
