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

Merge branch 'slurm-16.05' 

Conflicts:
	src/slurmd/slurmstepd/slurmstepd.c
parents d6abd1f4 2edc7012
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