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 2017/12/11 21:12:40 UTC
[airavata] 01/01: Merge branch 'google-analytics-ansible' 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 edf17835bf8778ddbd3c49c02a719efa03e358f3
Merge: 4ec92a7 27ea5d5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 11 16:10:07 2017 -0500
Merge branch 'google-analytics-ansible' into develop
README | 4 +-
dev-tools/ansible/{pga-scigap-dev.yml => gfac.yml} | 14 ++++-
.../develop/pga_config/TestApplication/vars.yml | 66 ++++++++++++++++++++++
.../develop/pga_config/TestApplication/vault.yml | 18 ++++++
.../scigap/production/group_vars/all/vars.yml | 2 +-
.../production/pga_config/newUltrascan/vars.yml | 1 +
.../scigap/production/pga_config/seagrid/vars.yml | 1 +
dev-tools/ansible/pga-scigap-dev.yml | 2 +-
dev-tools/ansible/pga-scigap-prod.yml | 2 +-
.../roles/keycloak/templates/standalone-ha.xml.j2 | 6 ++
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
.../ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
12 files changed, 109 insertions(+), 10 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.