Merge branch 'master' into 'mysql_fixes'
# Conflicts: # roles/mysql/tasks/mysql_server.yml
No related branches found
No related tags found
Showing
- buildCert.yml 10 additions, 10 deletionsbuildCert.yml
- buildKaraage3.x.yml 2 additions, 2 deletionsbuildKaraage3.x.yml
- extra_packages/tasks/main.yml 3 additions, 3 deletionsextra_packages/tasks/main.yml
- installNFS.yml 2 additions, 2 deletionsinstallNFS.yml
- roles/MonashBioinformaticsPlatform_node_allocation/tasks/main.yml 3 additions, 3 deletions...nashBioinformaticsPlatform_node_allocation/tasks/main.yml
- roles/OpenVPN-Client/handlers/main.yml 1 addition, 1 deletionroles/OpenVPN-Client/handlers/main.yml
- roles/OpenVPN-Client/tasks/installOpenVPN.yml 2 additions, 2 deletionsroles/OpenVPN-Client/tasks/installOpenVPN.yml
- roles/OpenVPN-Client/tasks/main.yml 1 addition, 1 deletionroles/OpenVPN-Client/tasks/main.yml
- roles/OpenVPN-Server/handlers/main.yml 1 addition, 1 deletionroles/OpenVPN-Server/handlers/main.yml
- roles/OpenVPN-Server/tasks/installOpenVPN.yml 4 additions, 4 deletionsroles/OpenVPN-Server/tasks/installOpenVPN.yml
- roles/OpenVPN-Server/tasks/main.yml 1 addition, 1 deletionroles/OpenVPN-Server/tasks/main.yml
- roles/apache2/tasks/apacheDebian.yml 5 additions, 5 deletionsroles/apache2/tasks/apacheDebian.yml
- roles/apache2/tasks/apacheRedHat.yml 5 additions, 5 deletionsroles/apache2/tasks/apacheRedHat.yml
- roles/apache2/tasks/main.yml 7 additions, 7 deletionsroles/apache2/tasks/main.yml
- roles/apt-get-update/tasks/main.yml 1 addition, 1 deletionroles/apt-get-update/tasks/main.yml
- roles/calculateExports/tasks/main.yml 1 addition, 1 deletionroles/calculateExports/tasks/main.yml
- roles/calculateKnownHosts/tasks/main.yml 2 additions, 2 deletionsroles/calculateKnownHosts/tasks/main.yml
- roles/calculateNhcConfig/tasks/main.yml 1 addition, 1 deletionroles/calculateNhcConfig/tasks/main.yml
- roles/calculateSlurmConf/tasks/main.yml 2 additions, 2 deletionsroles/calculateSlurmConf/tasks/main.yml
- roles/centos7Base/tasks/installBasePackages.yml 6 additions, 6 deletionsroles/centos7Base/tasks/installBasePackages.yml
Loading