You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/08/31 19:34:58 UTC
[5/5] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/114fa739
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/114fa739
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/114fa739
Branch: refs/heads/master
Commit: 114fa739232b695aa51425735ab2acc27c24634e
Parents: 284ce42 d8761f0
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Aug 31 23:04:19 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Aug 31 23:04:19 2015 +0530
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 20 ++++++++++++++----
.../airavata/api/server/util/Constants.java | 5 +++--
.../airavata/common/utils/ServerSettings.java | 22 +++++++++++++-------
.../main/resources/airavata-server.properties | 7 +++++++
4 files changed, 40 insertions(+), 14 deletions(-)
----------------------------------------------------------------------