Skip to content
GitLab
Commit a674330b authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-16.05' 

Conflicts:
	src/plugins/switch/generic/switch_generic.c
	src/slurmd/slurmstepd/task.c
parents 9bcc336b 781ee2b3
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