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 2015/11/11 17:35:28 UTC

[2/2] airavata git commit: Merge remote-tracking branch 'origin/develop' into develop

Merge remote-tracking branch 'origin/develop' into develop


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

Branch: refs/heads/develop
Commit: 5b9a48d57812ce3a3d9321c2e6104773c084969f
Parents: 091fcdc 832b146
Author: smarru <sm...@apache.org>
Authored: Wed Nov 11 11:35:25 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Wed Nov 11 11:35:25 2015 -0500

----------------------------------------------------------------------
 .../apache/airavata/gfac/core/GFacUtils.java    |  6 ++--
 .../gfac/core/context/ProcessContext.java       | 19 +++++++++----
 .../org/apache/airavata/gfac/impl/Factory.java  | 29 +++++++++++++++++---
 .../airavata/gfac/impl/GFacEngineImpl.java      |  3 +-
 .../airavata/gfac/impl/task/DataStageTask.java  |  4 +--
 .../impl/task/DefaultJobSubmissionTask.java     |  4 +--
 .../gfac/impl/task/EnvironmentSetupTask.java    |  2 +-
 .../gfac/impl/task/ForkJobSubmissionTask.java   |  2 +-
 .../gfac/impl/task/SCPDataStageTask.java        |  6 ++--
 .../gfac/impl/task/utils/StreamData.java        |  4 +--
 10 files changed, 54 insertions(+), 25 deletions(-)
----------------------------------------------------------------------