You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/16 01:37:41 UTC

[2/4] airavata git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop

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

Branch: refs/heads/master
Commit: 887ea094f6c7ba6f46e573d75ed85f56f1c50807
Parents: c36aa15 6ebc2b3
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 14 11:58:10 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 14 11:58:10 2016 -0400

----------------------------------------------------------------------
 .../src/main/resources/bin/airavata-server.bat  |  2 +-
 .../src/main/resources/bin/airavata-server.sh   |  8 ++---
 .../src/main/resources/bin/api-server.sh        |  6 ++--
 .../src/main/resources/bin/gfac-server.sh       |  6 ++--
 .../main/resources/bin/orchestrator-server.sh   |  6 ++--
 distribution/src/main/resources/bin/setenv.bat  | 14 ++------
 distribution/src/main/resources/bin/setenv.sh   | 37 ++------------------
 .../src/main/resources/bin/workflow-server.sh   |  6 ++--
 .../main/resources/samples/registerSample.sh    |  3 +-
 .../main/resources/airavata-server.properties   |  2 +-
 .../src/main/resources/db-migrate.sh            |  3 +-
 11 files changed, 20 insertions(+), 73 deletions(-)
----------------------------------------------------------------------