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 2014/01/28 22:00:25 UTC
[2/2] 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/361c2ff0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/361c2ff0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/361c2ff0
Branch: refs/heads/master
Commit: 361c2ff01d4d90d400d78c3bd893204c80258530
Parents: c750c23 ab892f7
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Jan 28 15:59:15 2014 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Jan 28 15:59:15 2014 -0500
----------------------------------------------------------------------
.../apache/airavata/integration/BaseCaseIT.java | 6 +-
.../src/test/resources/comma_data.sh | 0
.../orchestrator/core/AbstractOrchestrator.java | 5 +-
.../main/resources/airavata-server.properties | 235 ++++++++++++++++++-
.../core/AbstractOrchestratorTest.java | 5 +-
.../test/resources/airavata-server.properties | 1 +
test.git | 1 +
7 files changed, 243 insertions(+), 10 deletions(-)
----------------------------------------------------------------------