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/03/11 23:03:18 UTC
[airavata] branch develop updated (ad70ca7 -> 75ba6c2)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from ad70ca7 Merge branch 'AIRAVATA-3585' into develop
add b3d51aa Ansible: disabling global floods app until we get it working
add 52bff1d Ansible: pubad django app config
add f9fd8be Update email-config.yaml.j2
add e278f82 Ansible: update/downgrade zabbix agent to 4.0.x
new 75ba6c2 Merge branch 'master' into develop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scigap/production/host_vars/bcbportal/vars.yml | 4 ++++
.../production/host_vars/global-flood/vars.yml | 4 ++--
.../templates/email-monitor/email-config.yaml.j2 | 1 +
dev-tools/ansible/roles/zabbix/defaults/main.yml | 1 +
dev-tools/ansible/roles/zabbix/tasks/main.yml | 23 ++++++++++++++++++++--
5 files changed, 29 insertions(+), 4 deletions(-)
[airavata] 01/01: Merge branch 'master' into develop
Posted by ma...@apache.org.
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 75ba6c2c2dd4993a7a57cabede0ed42f25220011
Merge: ad70ca7 e278f82
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Mar 11 18:03:03 2022 -0500
Merge branch 'master' into develop
.../scigap/production/host_vars/bcbportal/vars.yml | 4 ++++
.../production/host_vars/global-flood/vars.yml | 4 ++--
.../templates/email-monitor/email-config.yaml.j2 | 1 +
dev-tools/ansible/roles/zabbix/defaults/main.yml | 1 +
dev-tools/ansible/roles/zabbix/tasks/main.yml | 23 ++++++++++++++++++++--
5 files changed, 29 insertions(+), 4 deletions(-)