Merge remote-tracking branch 'origin/master' into youshallnotchanged
Showing
- roles/mailchimpLastlogin/templates/ldapconfig.yml.j2 1 addition, 1 deletionroles/mailchimpLastlogin/templates/ldapconfig.yml.j2
- roles/mellanox_drivers/defaults/main.yml 0 additions, 0 deletionsroles/mellanox_drivers/defaults/main.yml
- roles/mellanox_drivers/tasks/main.yml 1 addition, 1 deletionroles/mellanox_drivers/tasks/main.yml
- roles/nat_server/tasks/main.yml 2 additions, 0 deletionsroles/nat_server/tasks/main.yml
Loading