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 15a3a3833c59be4e21ffeabd504ca07fb9e9b02d Merge: e604a557e6 e82a087fee Author: Marcus Christie <[email protected]> AuthorDate: Tue Nov 15 17:58:15 2022 -0500 Merge branch 'master' into develop .../production/host_vars/ampgateway/vars.yml | 7 ++-- .../production/host_vars/bayesprism/vars.yml | 15 ++++---- .../scigap/production/host_vars/delta/vars.yml | 9 +++-- .../host_vars/microbial-genomes/vars.yml | 13 ++++--- .../{delta => vlab-plasmascience}/vars.yml | 41 ++++++++++------------ .../host_vars/vlab-plasmascience/vault.yml | 12 +++++++ .../ansible/inventories/scigap/production/hosts | 3 ++ dev-tools/ansible/roles/django/tasks/main.yml | 12 +++++++ dev-tools/ansible/roles/httpd/tasks/main.yml | 7 ++++ 9 files changed, 81 insertions(+), 38 deletions(-)
