You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by di...@apache.org on 2022/01/01 23:53:02 UTC

[airavata] 01/01: Merge branch 'AIRAVATA-3549' into develop

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 97a939e47f79eab00375cfa25774a57b7ff4ba51
Merge: 9768729 41b67ac
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Sat Jan 1 18:52:49 2022 -0500

    Merge branch 'AIRAVATA-3549' into develop
    
    # Conflicts:
    #	modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java

 .../airavata/helix/impl/task/AiravataTask.java     |   6 +-
 .../airavata/helix/impl/task/TaskContext.java      | 340 +++++++++++----------
 .../helix/impl/task/staging/DataStagingTask.java   |  14 +-
 .../task/submission/DefaultJobSubmissionTask.java  |   6 +-
 .../task/submission/config/GroovyMapBuilder.java   |   5 +-
 5 files changed, 194 insertions(+), 177 deletions(-)