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/01/18 13:56:14 UTC

[airavata] 02/02: Merge branch 'airavata-3319'

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

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

commit de3fa662e4cf18617388d2791a276aa2d796efb8
Merge: 0271293 521b75a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jan 18 08:55:21 2022 -0500

    Merge branch 'airavata-3319'

 .../iam/admin/services/core/impl/TenantManagementKeycloakImpl.java  | 1 +
 .../ansible/inventories/scigap/develop/group_vars/django/vars.yml   | 1 +
 .../ansible/inventories/scigap/develop/host_vars/seagrid/vars.yml   | 2 ++
 .../inventories/scigap/production/group_vars/django/vars.yml        | 1 +
 .../ansible/inventories/scigap/production/host_vars/delta/vars.yml  | 2 ++
 .../scigap/production/host_vars/microbial-genomes/vars.yml          | 2 ++
 .../ansible/inventories/scigap/production/host_vars/phasta/vars.yml | 2 ++
 .../ansible/inventories/scigap/production/host_vars/saverx/vars.yml | 2 ++
 .../inventories/scigap/production/host_vars/seagrid/vars.yml        | 2 ++
 .../inventories/scigap/production/host_vars/simvascular/vars.yml    | 2 ++
 .../inventories/scigap/production/host_vars/testdrive/vars.yml      | 2 ++
 dev-tools/ansible/roles/django/templates/settings_local.py.j2       | 6 ++++++
 12 files changed, 25 insertions(+)