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/05/23 20:24:09 UTC
[airavata] 02/02: Merge branch 'AIRAVATA-3622' 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 4d130b3374e42d0a0ba380232acadb38a37771c4
Merge: 3ffe25098b fe009e7112
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon May 23 16:08:25 2022 -0400
Merge branch 'AIRAVATA-3622' into develop
.../iam-admin-services-core/pom.xml | 2 +-
.../scigap/develop/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/all/vars.yml | 4 ++--
.../scigap/production/group_vars/django/vars.yml | 1 +
.../production/host_vars/ampgateway/vars.yml | 3 +++
.../production/host_vars/global-flood/vars.yml | 8 +++++--
.../scigap/production/host_vars/lrose/vars.yml | 2 +-
.../host_vars/microbial-genomes/vars.yml | 2 ++
.../production/host_vars/pace-gatech/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 3 ++-
.../django/templates/django-ssl-vhost.conf.j2 | 9 ++++++++
.../roles/django/templates/django-vhost.conf.j2 | 8 +++++++
.../templates/email-monitor/email-config.yaml.j2 | 9 ++++++--
modules/distribution/pom.xml | 27 +++++++---------------
.../src/main/resources/email-config.yaml | 6 ++---
pom.xml | 8 +++----
16 files changed, 60 insertions(+), 38 deletions(-)
diff --cc modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
index cb99eda218,a91b374a53..7f804e99ff
--- a/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
+++ b/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
@@@ -20,6 -20,6 +20,6 @@@ config
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
- - jobManagerType: HTCONDOR
- emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
+ # - jobManagerType: HTCONDOR
+ # emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
-# resourceEmailAddresses:
++# resourceEmailAddresses: