You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2020/09/03 09:29:21 UTC
[airavata] 01/01: Merge branch 'master' into develop
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 7912ba9842de8855a451a0cd90192b81ea634a87
Merge: 194f4c2 cb81aad
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Sep 3 01:08:12 2020 -0400
Merge branch 'master' into develop
# Conflicts:
# README.md
README.md | 215 ++++++++-------------
.../scigap/production/files/client_truststore.jks | Bin 5398 -> 6618 bytes
.../scigap/production/group_vars/all/vars.yml | 3 +
.../scigap/production/host_vars/delta/vars.yml | 2 +
.../scigap/production/host_vars/lrose/vars.yml | 51 +++++
.../scigap/production/host_vars/lrose/vault.yml | 15 ++
.../host_vars/microbial-genomes/vars.yml | 12 +-
.../scigap/production/host_vars/searchsra/vars.yml | 4 +-
.../scigap/production/host_vars/simccs/vars.yml | 2 +-
.../production/host_vars/simvascular/vars.yml | 2 +-
.../scigap/production/host_vars/tutorial/vars.yml | 51 +++++
.../scigap/production/host_vars/tutorial/vault.yml | 15 ++
.../ansible/inventories/scigap/production/hosts | 4 +
.../scigap/staging/files/client_truststore.jks | Bin 5398 -> 6618 bytes
.../roles/django/templates/settings_local.py.j2 | 3 +
.../templates/email-monitor/email-config.yaml.j2 | 1 +
dev-tools/ansible/roles/keycloak/tasks/main.yml | 2 +-
pom.xml | 2 +-
18 files changed, 238 insertions(+), 146 deletions(-)