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 73ca271c35e9472054ded26ca2b68df7a5e407ca Merge: ad5ce3b a2718ab Author: Marcus Christie <[email protected]> AuthorDate: Thu Jan 30 15:36:29 2020 -0500 Merge branch 'AIRAVATA-3293--Job---JobStatus-entity-mapping-issue' into develop .../scigap/production/group_vars/all/vars.yml | 7 ++ .../host_vars/dreg/files/django-ssl-vhost.conf.j2 | 88 ++++++++++++++++++++++ .../scigap/production/host_vars/dreg/vars.yml | 1 + .../scigap/production/host_vars/smaltr/vars.yml | 8 +- .../scigap/production/host_vars/toppic/vars.yml | 50 ++++++++++++ .../scigap/production/host_vars/toppic/vault.yml | 15 ++++ .../ansible/inventories/scigap/production/hosts | 1 + .../ansible/roles/django_setup/tasks/main.yml | 2 + .../templates/email-monitor/email-config.yaml.j2 | 1 + .../helix/impl/workflow/PostWorkflowManager.java | 1 + .../core/entities/expcatalog/JobStatusEntity.java | 7 +- 11 files changed, 175 insertions(+), 6 deletions(-)
