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 2022/07/30 20:09:08 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 9fd7b2e6203ac467ea7daee8b4ee9d0e6f9ebc96
Merge: eec05021bc 9fa2751388
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Sat Jul 30 16:08:56 2022 -0400
Merge branch 'master' into develop
.../scigap/production/group_vars/django/vault.yml | 10 +++++++
.../production/host_vars/ampgateway/vars.yml | 4 +--
.../host_vars/{regsnps => bayesprism}/vars.yml | 31 ++++++++--------------
.../production/host_vars/bayesprism/vault.yml | 12 +++++++++
.../scigap/production/host_vars/dreg/vars.yml | 16 +++++++----
.../host_vars/{regsnps => ehtgateway}/vars.yml | 31 ++++++++--------------
.../production/host_vars/ehtgateway/vault.yml | 12 +++++++++
.../production/host_vars/futurewater/vars.yml | 17 ++++++++----
.../scigap/production/host_vars/geo/vars.yml | 3 ++-
.../scigap/production/host_vars/immune/vars.yml | 3 ++-
.../scigap/production/host_vars/lrose/vars.yml | 3 ++-
.../host_vars/microbial-genomes/vars.yml | 3 ++-
.../scigap/production/host_vars/regsnps/vars.yml | 3 ++-
.../scigap/production/host_vars/simccs/vars.yml | 7 ++---
.../production/host_vars/simvascular_old/vars.yml | 2 +-
.../scigap/production/host_vars/testdrive/vars.yml | 3 ++-
.../ansible/inventories/scigap/production/hosts | 6 +++--
dev-tools/ansible/roles/httpd/tasks/main.yml | 19 +++++++++++--
18 files changed, 119 insertions(+), 66 deletions(-)