Skip to content
GitLab
Commit 21ad3f58 authored by jette's avatar jette
Browse files

Merge branch 'slurm-2.5' 

Conflicts:
	src/Makefile.am
	src/common/gres.c
	src/plugins/mpi/pmi2/spawn.c
	src/srun_cr/Makefile.am
	src/srun_cr/Makefile.in
parents daf511d9 0dfe44c6
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment