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/08/02 20:37:38 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 e7fd8c2d90bd243746e9d31eec5163cf3509994d
Merge: 39a05612d2 a7ee6ee294
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Aug 2 16:37:23 2022 -0400

    Merge branch 'master' into develop

 dev-tools/ansible/README.md                        | 41 ++++++++++++++--------
 .../production/host_vars/futurewater/vars.yml      |  5 ++-
 dev-tools/ansible/roles/zabbix/defaults/main.yml   |  1 +
 .../main.yml => tasks/install_deps_CentOS_7.yml}   | 18 ++++++++--
 .../main.yml => tasks/install_deps_Rocky_8.yml}    | 19 ++++++++--
 dev-tools/ansible/roles/zabbix/tasks/main.yml      | 29 +--------------
 6 files changed, 63 insertions(+), 50 deletions(-)