Merge branch 'master' into 'telegraf-1.15'
# Conflicts: # roles/telegraf/templates/telegraf.conf.j2
Showing
- roles/buildLustreClient/defaults/main.yml 2 additions, 0 deletionsroles/buildLustreClient/defaults/main.yml
- roles/buildLustreClient/tasks/main.yml 51 additions, 0 deletionsroles/buildLustreClient/tasks/main.yml
- roles/mailchimpLastlogin/tasks/main.yml 1 addition, 0 deletionsroles/mailchimpLastlogin/tasks/main.yml
- roles/mellanox_drivers/defaults/main.yml 1 addition, 0 deletionsroles/mellanox_drivers/defaults/main.yml
- roles/mellanox_drivers/tasks/main.yml 9 additions, 1 deletionroles/mellanox_drivers/tasks/main.yml
- roles/sysctl_max_user_name_spaces/files/max_user_name_spaces.conf 1 addition, 0 deletions...sctl_max_user_name_spaces/files/max_user_name_spaces.conf
- roles/sysctl_max_user_name_spaces/tasks/main.yml 12 additions, 0 deletionsroles/sysctl_max_user_name_spaces/tasks/main.yml
Loading
Please register or sign in to comment