Skip to content
GitLab
Commit 97c485bf authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02 

# Conflicts:
#	src/slurmctld/proc_req.c
parents 63051cab a4c51165
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