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 2021/01/04 17:17:01 UTC
[airavata] 02/02: Merge branch 'AIRAVATA-3397' 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 d7b9f2b531424e87b26c87490f089b52fd30c5e7
Merge: 9939e07 d19a697
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jan 4 11:58:38 2021 -0500
Merge branch 'AIRAVATA-3397' into develop
.../core/impl/TenantManagementKeycloakImpl.java | 28 ++++++----
.../service/security/KeyCloakSecurityManager.java | 15 +++---
.../security/KeyCloakSecurityManagerTest.java | 1 +
.../scigap/develop/group_vars/all/vars.yml | 6 +--
.../scigap/production/group_vars/all/vars.yml | 6 +--
.../production/host_vars/covid-geoact/vars.yml | 54 +++++++++++++++++++
.../production/host_vars/covid-geoact/vault.yml | 15 ++++++
.../scigap/production/host_vars/geo/vars.yml | 60 ++++++++++++++++++++++
.../scigap/production/host_vars/geo/vault.yml | 15 ++++++
.../production/host_vars/pace-gatech/vars.yml | 2 +-
.../ansible/inventories/scigap/production/hosts | 2 +
.../scigap/staging/group_vars/all/vars.yml | 6 +--
.../templates/airavata-server.properties.j2 | 4 +-
dev-tools/ansible/roles/common/defaults/main.yml | 1 -
dev-tools/ansible/roles/common/tasks/main.yml | 1 +
.../ansible/roles/keycloak/templates/vhost.conf.j2 | 2 +-
.../task/submission/config/GroovyMapBuilder.java | 2 +-
.../airavata/common/utils/ApplicationSettings.java | 4 ++
.../src/main/resources/airavata-server.properties | 4 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 1 +
.../registry/server/SharingRegistryServer.java | 4 +-
21 files changed, 200 insertions(+), 33 deletions(-)