You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2021/02/01 18:45:36 UTC
[airavata] 02/03: Merge branch 'develop' of
github.com:apache/airavata into develop
This is an automated email from the ASF dual-hosted git repository.
eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 2a4ca69878f988bdcde8bb710104b22c3fdbd169
Merge: 2725c42 ba8e0ea
Author: eroma2014 <er...@gmail.com>
AuthorDate: Mon Feb 1 13:44:43 2021 -0500
Merge branch 'develop' of github.com:apache/airavata 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 | 64 ++++++++++++++++++++++
.../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 +
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../django/templates/django-ssl-vhost.conf.j2 | 9 +++
.../roles/django/templates/django-vhost.conf.j2 | 9 +++
.../ansible/roles/keycloak/templates/vhost.conf.j2 | 2 +-
.../airavata/helix/adaptor/PoolingSSHJClient.java | 2 +-
.../helix/adaptor/wrapper/SFTPClientWrapper.java | 1 -
.../task/submission/config/GroovyMapBuilder.java | 2 +-
.../airavata/common/utils/ApplicationSettings.java | 4 ++
.../src/main/resources/airavata-server.properties | 4 +-
.../expcatalog/ExperimentSummaryRepository.java | 12 ++--
.../airavata/registry/core/utils/DBConstants.java | 2 +-
.../ExperimentSummaryRepositoryTest.java | 18 ++++++
.../DeltaScripts/appCatalog_schema_delta.sql | 1 +
.../registry/server/SharingRegistryServer.java | 4 +-
29 files changed, 249 insertions(+), 42 deletions(-)