You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/09/18 16:18:39 UTC
[2/2] airavata git commit: Fixed merge conflict
Fixed merge conflict
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8139a8d8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8139a8d8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8139a8d8
Branch: refs/heads/master
Commit: 8139a8d8ddf24024e20015bb4efebf3501299802
Parents: af8a84c ea0fb52
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Sep 18 10:18:33 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Sep 18 10:18:33 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 5 ++---
.../airavata/gfac/impl/task/AdvancedSCPDataStageTask.java | 1 -
.../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 8 +++++++-
.../catalog/resources/ExperimentInputResource.java | 2 +-
.../catalog/resources/ExperimentOutputResource.java | 2 +-
.../experiment/catalog/resources/ExperimentResource.java | 2 +-
.../core/experiment/catalog/resources/JobResource.java | 2 +-
.../core/experiment/catalog/resources/JobStatusResource.java | 2 +-
.../experiment/catalog/resources/ProcessErrorResource.java | 3 ++-
.../experiment/catalog/resources/ProcessInputResource.java | 3 ++-
.../experiment/catalog/resources/ProcessOutputResource.java | 3 ++-
.../core/experiment/catalog/resources/ProcessResource.java | 3 ++-
.../catalog/resources/ProcessResourceScheduleResource.java | 3 ++-
.../experiment/catalog/resources/ProcessStatusResource.java | 3 ++-
.../core/experiment/catalog/resources/TaskErrorResource.java | 3 ++-
.../core/experiment/catalog/resources/TaskResource.java | 3 ++-
.../experiment/catalog/resources/TaskStatusResource.java | 3 ++-
.../catalog/resources/UserConfigurationDataResource.java | 3 ++-
18 files changed, 34 insertions(+), 20 deletions(-)
----------------------------------------------------------------------