airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Wed, 12 Mar 2014 14:49:52 GMT
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/bb988d37
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bb988d37
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bb988d37

Branch: refs/heads/master
Commit: bb988d37738d4012592e1123f08ea282b85485c1
Parents: 744b546 13c67c4
Author: lahiru <lahiru@apache.org>
Authored: Wed Mar 12 10:49:45 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Wed Mar 12 10:49:45 2014 -0400

----------------------------------------------------------------------
 .../common/utils/ApplicationSettings.java       |  17 ++-
 .../airavata/common/utils/StringUtil.java       |   5 +-
 .../src/main/assembly/bin-assembly.xml          |  18 ---
 .../src/main/resources/bin/airavata-server.sh   |  63 +++++++---
 .../resources/conf/airavata-server.properties   |   3 +
 .../org/apache/airavata/server/ServerMain.java  | 119 ++++++++++++-------
 6 files changed, 144 insertions(+), 81 deletions(-)
----------------------------------------------------------------------



Mime
View raw message