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 2020/01/03 18:06:43 UTC

[airavata] 01/01: Merge branch 'airavata-3287' 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 63f5d6c4ab41cb88acd71a5b9b7ba8213395bc79
Merge: 51777de 8213960
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Jan 3 13:06:26 2020 -0500

    Merge branch 'airavata-3287' into develop
    
    # Conflicts:
    #	modules/airavata-helix/agent-impl/sshj-agent/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java

 .../airavata/helix/adaptor/PoolingSSHJClient.java  |  75 ++++++----
 .../airavata/helix/adaptor/SSHJAgentAdaptor.java   | 152 +++++++++++++++++++--
 .../adaptor/wrapper/SCPFileTransferWrapper.java    |  12 +-
 .../helix/adaptor/wrapper/SFTPClientWrapper.java   |  12 +-
 .../helix/adaptor/wrapper/SSHClientWrapper.java    |  25 ++++
 .../helix/adaptor/wrapper/SessionWrapper.java      |  12 +-
 .../helix/impl/workflow/PreWorkflowManager.java    |  33 +++--
 7 files changed, 269 insertions(+), 52 deletions(-)