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 9be2b9debc889e1d8d548e30afac72c45ab66167 Merge: 11a5ecc c3df4c3 Author: Marcus Christie <[email protected]> AuthorDate: Fri Jul 19 09:01:22 2019 -0400 Merge remote-tracking branch 'origin/staging' into develop dev-tools/ansible/django.yml | 3 --- .../inventories/scigap/staging/pga_config/seagrid/vars.yml | 2 ++ dev-tools/ansible/roles/django/tasks/main.yml | 8 ++++++++ dev-tools/ansible/roles/django_setup/tasks/main.yml | 3 +++ dev-tools/ansible/roles/pga/defaults/main.yml | 2 ++ dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 12 ++++++++++++ .../helix/impl/task/submission/config/GroovyMapBuilder.java | 8 ++++---- 7 files changed, 31 insertions(+), 7 deletions(-)
