[airavata] branch develop updated (b161235 -> de6b317)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from b161235  Merge branch 'prometheus-integration' into develop
     add 9ef272a  Minor fix of permissions in setting up monitoring firewalls
     new de6b317  Merge branch 'prometheus-integration' into develop

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../inventories/scigap/develop/group_vars/all/vars.yml   |  3 ++-
 .../scigap/production/group_vars/all/vars.yml            |  3 ++-
 dev-tools/ansible/roles/helix_setup/tasks/main.yml       | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

[airavata] 01/01: Merge branch 'prometheus-integration' into develop

[di...@apache.org]

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 de6b31742ef40b5eaff314b6de28f0b9893f26ec
Merge: b161235 9ef272a
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Dec 8 13:48:38 2020 -0500

    Merge branch 'prometheus-integration' into develop

 .../inventories/scigap/develop/group_vars/all/vars.yml   |  3 ++-
 .../scigap/production/group_vars/all/vars.yml            |  3 ++-
 dev-tools/ansible/roles/helix_setup/tasks/main.yml       | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)