You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by sh...@apache.org on 2015/08/31 17:56:56 UTC

[2/2] 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/d8761f07
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8761f07
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8761f07

Branch: refs/heads/master
Commit: d8761f07b089a3b8020871c2613f40a08a28c531
Parents: 99abcaf dded7ac
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Mon Aug 31 11:56:45 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Mon Aug 31 11:56:45 2015 -0400

----------------------------------------------------------------------
 .../airavata/api/server/AiravataAPIServer.java  | 20 ++++++++++++++----
 .../airavata/common/utils/ServerSettings.java   | 22 +++++++++++++-------
 .../main/resources/airavata-server.properties   |  7 +++++++
 3 files changed, 37 insertions(+), 12 deletions(-)
----------------------------------------------------------------------