Skip to content
GitLab
Commit 9980a93b authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.3' 

Conflicts:
	src/slurmd/slurmstepd/multi_prog.c
	src/slurmd/slurmstepd/multi_prog.h
parents 48be23c0 06750780
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