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

Merge branch 'slurm-16.05' 

Conflicts:
	src/slurmctld/job_mgr.c
parents ff592fa5 cb7ed937
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