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

Merge branch 'slurm-16.05' into slurm-17.02 

Conflicts:
	src/slurmctld/job_mgr.c
parents 6e353a43 72c0b659
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