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 35bbf10eea2272808b18d8fb417ff7cf64042a92 Merge: 333d7f3 4eb4476 Author: Marcus Christie <[email protected]> AuthorDate: Wed Aug 4 16:10:23 2021 -0400 Merge branch 'airavata-3420' into develop dev-tools/ansible/inventories/scigap/production/hosts | 3 ++- .../roles/django/templates/django-ssl-vhost.conf.j2 | 2 +- .../ansible/roles/django/templates/django-vhost.conf.j2 | 2 +- .../ansible/roles/django/templates/settings_local.py.j2 | 14 +++++++++++--- 4 files changed, 15 insertions(+), 6 deletions(-)
