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 2023/06/05 22:19:38 UTC

[airavata] 02/02: Merge branch 'ansible-haproxy' 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 4da6cffda5acb38e4a79341e466acfee2d123f6e
Merge: c3ac4b390f fe68cafe32
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 5 18:19:25 2023 -0400

    Merge branch 'ansible-haproxy' into develop

 .../scigap/develop/group_vars/all/vars.yml            |  2 +-
 .../scigap/production/group_vars/all/vars.yml         |  2 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml       | 19 +++++++------------
 .../ansible/roles/api-orch/templates/haproxy.cfg.j2   |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)