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 42be237cd0f43ffe2981fe7bf7c13bdef106c55a Merge: 5d18d51 7d57a5e Author: Marcus Christie <[email protected]> AuthorDate: Wed Sep 12 16:52:49 2018 -0400 Merge branch 'ansible-upgrade' into develop .../{iugeosurvey => ampgateway}/vars.yml | 29 ++++++++++++---------- .../production/pga_config/ampgateway/vault.yml | 18 ++++++++++++++ .../production/pga_config/iugeosurvey/vars.yml | 9 ++++--- .../{iugeosurvey => rutgersgemr}/vars.yml | 27 +++++++++++--------- .../production/pga_config/rutgersgemr/vault.yml | 18 ++++++++++++++ .../pga_config/simvascular/files/pga_config.php.j2 | 2 +- .../production/pga_config/simvascular/vars.yml | 3 +++ .../production/pga_config/testdrive/vars.yml | 10 +++----- dev-tools/ansible/pga-scigap-prod.yml | 4 ++- dev-tools/ansible/requirements.txt | 2 +- .../roles/pga/templates/pga-ssl-vhost.conf.j2 | 4 +++ 11 files changed, 87 insertions(+), 39 deletions(-)
