This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b0b32f7318cd75adb9bca6f5dc51564528a4aa61
Merge: b99f516 85c222b
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Fri Feb 23 01:22:19 2018 -0500
Merge branch 'develop' into group-based-auth
.../api/server/handler/AiravataServerHandler.java | 55 +++++++++++++++++
.../scigap/develop/group_vars/all/vars.yml | 1 +
.../scigap/develop/pga_config/scigap/vars.yml | 2 +-
.../scigap/develop/pga_config/seagrid/vars.yml | 2 +-
.../scigap/develop/pga_config/testdrive/vars.yml | 2 +-
.../scigap/dreg-production/group_vars/pga/vars.yml | 2 +-
.../group_vars/all/vars.yml | 63 +++++++++++--------
.../inventories/standalone/group_vars/pga/vars.yml | 70 ++++++++++++++++++++++
dev-tools/ansible/inventories/standalone/hosts | 24 ++++++++
.../inventories/template/group_vars/all/vars.yml | 11 +++-
dev-tools/ansible/roles/api-orch/defaults/main.yml | 13 +++-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 12 ++--
.../templates/airavata-server.properties.j2 | 6 +-
dev-tools/ansible/roles/common/tasks/main.yml | 4 +-
.../ansible/roles/database/tasks/keycloak.yml | 2 +-
dev-tools/ansible/roles/database/tasks/main.yml | 2 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 4 ++
dev-tools/ansible/roles/gfac/defaults/main.yml | 5 +-
.../gfac/templates/airavata-server.properties.j2 | 6 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 13 +++-
dev-tools/ansible/roles/pga/tasks/main.yml | 16 ++++-
.../default.conf => templates/default.conf.j2} | 3 +-
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 4 +-
.../ansible/roles/pga/templates/pga-vhost.conf.j2 | 2 +-
.../pga/{files/ssl.conf => templates/ssl.conf.j2} | 4 +-
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 8 +--
.../templates/airavata-server.properties.j2 | 2 +-
dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +-
.../roles/zookeeper/vars/main.yml | 2 +-
.../store/impl/util/CredentialStoreInitUtil.java | 1 +
.../org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../airavata/gfac/server/GfacServerHandler.java | 56 ++++++++---------
.../registry-server/registry-api-service/pom.xml | 2 +-
33 files changed, 301 insertions(+), 102 deletions(-)
--
To stop receiving notification emails like this one, please contact
machris...@apache.org.
