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

Posted to commits@airavata.apache.org by ma...@apache.org on 2021/01/15 21:41:36 UTC

[airavata] 02/02: Merge branch 'airavata-3401' into develop

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

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

commit ba8e0eaa4ecc933d204bd5709b002617b5c69bb9
Merge: d7b9f2b 59f74f2
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 15 16:40:33 2021 -0500

    Merge branch 'airavata-3401' into develop

 .../scigap/production/host_vars/geo/vars.yml           |  4 ++++
 dev-tools/ansible/roles/django/defaults/main.yml       |  1 +
 .../roles/django/templates/django-ssl-vhost.conf.j2    |  9 +++++++++
 .../roles/django/templates/django-vhost.conf.j2        |  9 +++++++++
 .../airavata/helix/adaptor/PoolingSSHJClient.java      |  2 +-
 .../helix/adaptor/wrapper/SFTPClientWrapper.java       |  1 -
 .../expcatalog/ExperimentSummaryRepository.java        | 12 ++++++------
 .../airavata/registry/core/utils/DBConstants.java      |  2 +-
 .../expcatalog/ExperimentSummaryRepositoryTest.java    | 18 ++++++++++++++++++
 9 files changed, 49 insertions(+), 9 deletions(-)