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/02/11 22:03:05 UTC

[14/14] git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f6db4395
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f6db4395
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f6db4395

Branch: refs/heads/master
Commit: f6db43953c84f8e293c28cb599ac96884295ebc7
Parents: 7456b46 cb78c92
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Feb 11 16:02:46 2014 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Feb 11 16:02:46 2014 -0500

----------------------------------------------------------------------
 .../org/apache/airavata/gfac/Scheduler.java     | 27 +++++++-
 .../org/apache/airavata/gfac/cpi/GFacAPI.java   |  1 -
 .../core/impl/EmbeddedGFACJobSubmitter.java     | 19 +++---
 .../cpi/impl/AbstractOrchestrator.java          |  1 +
 .../test/resources/airavata-client.properties   | 66 ++++++++++++++++++++
 .../src/test/resources/gfac-config.xml          | 13 +++-
 6 files changed, 110 insertions(+), 17 deletions(-)
----------------------------------------------------------------------