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/7addfd91 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7addfd91 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7addfd91 Branch: refs/heads/master Commit: 7addfd91640c46194ec2b2181275bcc80c1c05d6 Parents: 0b40482 73fee6b Author: scnakandala <[email protected]> Authored: Wed Jul 6 14:49:14 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jul 6 14:49:14 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 4 +++- .../java/org/apache/airavata/gfac/impl/task/DataStageTask.java | 3 +-- .../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
