airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject [airavata] 03/03: Merge remote-tracking branch 'origin/master'
Date Thu, 15 Mar 2018 20:29:38 GMT
This is an automated email from the ASF dual-hosted git repository.

eroma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit afe33c8d035292fa59bced09f6592f867bbf7866
Merge: fb59d8d e9dd9a4
Author: Eroma Abeysinghe <eroma.abeysinghe@gmail.com>
AuthorDate: Thu Mar 15 16:29:31 2018 -0400

    Merge remote-tracking branch 'origin/master'

 .../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 |  4 +-
 .../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 | 12 +++-
 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}     |  2 +-
 .../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 +
 .../registry-server/registry-api-service/pom.xml   |  2 +-
 pom.xml                                            | 36 ++++++++++-
 32 files changed, 307 insertions(+), 74 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
eroma@apache.org.

Mime
View raw message