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 2023/09/12 20:54:25 UTC

[airavata] 01/01: Merge branch 'master' 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 d996abb88edbc03ca1f8432b39db9341ea7b19fa
Merge: 643f984bac 5a22abf9f3
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Sep 12 16:53:54 2023 -0400

    Merge branch 'master' into develop

 .../host_vars/molecular-dynamics/vars.yml          |   7 +-
 .../production/host_vars/pace-gatech/vars.yml      |   2 +
 .../scigap/production/host_vars/simccs/vars.yml    |   3 +-
 .../scigap/production/host_vars/smiles/vars.yml    |   7 +-
 .../django/templates/django-ssl-vhost.conf.j2      |   4 +-
 .../impl/ssh/SSHCredentialGenerator.java           | 101 ---------------------
 6 files changed, 12 insertions(+), 112 deletions(-)