This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d8ab05e534e23ee2ed25b22dc6ef15e6c2f2bee0 Merge: 9f0c6cd780 76b540edf9 Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Fri Sep 23 13:04:07 2022 -0400 Merge branch 'master' into develop .../production/host_vars/ampgateway/vars.yml | 7 +++--- .../production/host_vars/bayesprism/vars.yml | 13 +++++++++- .../scigap/production/host_vars/delta/vars.yml | 9 ++++--- .../scigap/production/host_vars/dreg/vars.yml | 8 +++--- .../production/host_vars/ehtgateway/vars.yml | 2 ++ .../production/host_vars/futurewater/vars.yml | 4 +-- .../production/host_vars/global-flood/vars.yml | 3 ++- .../production/host_vars/hicops-deepsnap/vars.yml | 3 ++- .../scigap/production/host_vars/simccs/vars.yml | 2 +- .../ansible/inventories/scigap/production/hosts | 9 ++++--- dev-tools/ansible/roles/django/tasks/database.yml | 3 ++- dev-tools/ansible/roles/django/tasks/main.yml | 2 +- dev-tools/ansible/roles/httpd/tasks/main.yml | 9 +++++-- dev-tools/ansible/roles/tusd/tasks/main.yml | 6 +++++ .../task/submission/config/GroovyMapBuilder.java | 5 +--- .../src/main/resources/HTCONDOR_Groovy.template | 5 +++- .../airavata/monitor/email/EmailBasedMonitor.java | 16 +++++++++--- .../email/parser/AiravataCustomMailParser.java | 3 ++- .../airavata/monitor/email/parser/EmailParser.java | 3 ++- .../monitor/email/parser/HTCondorEmailParser.java | 29 +++++++++++++++++++--- .../monitor/email/parser/LSFEmailParser.java | 3 ++- .../monitor/email/parser/PBSEmailParser.java | 3 ++- .../monitor/email/parser/SLURMEmailParser.java | 3 ++- .../monitor/email/parser/UGEEmailParser.java | 3 ++- 24 files changed, 110 insertions(+), 43 deletions(-)
