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 2021/06/09 21:00:47 UTC

[airavata] 02/02: Merge branch 'airavata-3455' 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 e5de21a429667fd6a89a8abb80962670ab434459
Merge: ba5a086 8b3f889
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 9 17:00:22 2021 -0400

    Merge branch 'airavata-3455' into develop

 .../production/host_vars/ampgateway/vars.yml       |  1 +
 .../scigap/production/host_vars/cgpe/vars.yml      | 50 ----------------------
 .../scigap/production/host_vars/cgpe/vault.yml     | 15 -------
 .../production/host_vars/hicops-deepsnap/vars.yml  |  2 +-
 .../scigap/production/host_vars/immune/vars.yml    |  3 ++
 .../scigap/production/host_vars/regsnps/vars.yml   |  6 +++
 .../ansible/inventories/scigap/production/hosts    |  1 -
 dev-tools/ansible/roles/django/defaults/main.yml   |  1 +
 .../expcatalog/ExperimentRepository.java           |  4 +-
 9 files changed, 15 insertions(+), 68 deletions(-)