Skip to content
Snippets Groups Projects
Commit c844d3a7 authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'master' of https://github.com/monash-merc/ansible_cluster_in_a_box into merge

Conflicts:
	roles/nfs-client/tasks/mountFileSystem.yml
	roles/slurm/tasks/main.yml
parents d7363d4f 35445fbe
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment