Merge branch 'master' of https://github.com/monash-merc/ansible_cluster_in_a_box (17b43371) · Commits · hpc-team / HPCasCode · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

HPCasCode
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

17b43371

Commit 17b43371 authored 9 years ago by Simon Michnowicz

Downloads
- Plain Diff

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

Conflicts:
	roles/calculateSlurmConf/templates/slurm.conf.j2

parents 2c5fc1dc 0a3623d8

No related branches found

No related tags found

1 merge request!3Master

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

roles/calculateSlurmConf/templates/slurm.conf.j2 3 additions, 0 deletions

roles/calculateSlurmConf/templates/slurm.conf.j2
roles/karaage3.1.17/templates/index.html.j2 4 additions, 15 deletions

roles/karaage3.1.17/templates/index.html.j2
roles/slurm-common/tasks/main.yml 8 additions, 0 deletions

roles/slurm-common/tasks/main.yml
roles/slurm-common/templates/slurm.epilog.j2 2 additions, 0 deletions

roles/slurm-common/templates/slurm.epilog.j2
roles/slurm-common/templates/slurm.prolog.j2 2 additions, 0 deletions

roles/slurm-common/templates/slurm.prolog.j2

with 19 additions and 15 deletions

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 sign in to comment