Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
VilleS1 committed Sep 18, 2020
2 parents db97dbe + a325d5b commit 17d35ea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion grid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
- { role: ansible-role-sshd, tags: [ 'sshd', 'ssh' ] }
- { role: ansible-role-aliases, tags: [ 'aliases', 'email' ] }
- { role: ansible-role-arc-client, tags: [ 'arc', 'nordugrid' ] }
- { role: ansible-role-arc-frontend, tags: [ 'arcfrontend' ] }
- { role: ansible-role-arc-frontend-6, tags: [ 'arcfrontend' ] }
- { role: ansible-role-fgci-bash, tags: [ 'bash'] }
- { role: ansible-role-collectd, tags: [ 'collectd', 'monitoring' ] }
- { role: ansible-role-postfix, tags: [ 'postfix', 'mail' ] }
Expand Down
6 changes: 3 additions & 3 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@

- src: https://github.com/CSCfi/ansible-role-arc-frontend-6
path: roles
version: v1.2.5
version: v1.2.8

- src: https://github.com/fgci-org/ansible-role-fgci-bash
path: roles
version: v1.3.0

- src: https://github.com/CSCfi/ansible-role-cuda
- src: https://github.com/fgci-org/ansible-role-cuda
path: roles
version: v1.6.7
version: v1.6.8

- src: https://github.com/CSCfi/ansible-role-nhc
path: roles
Expand Down
2 changes: 1 addition & 1 deletion roles/watermark-release/files/fgci-ansible-release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.2
2.2.3

0 comments on commit 17d35ea

Please sign in to comment.