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

Merge remote-tracking branch 'origin/slurm-18.08' 

# Conflicts:
#	doc/html/heterogeneous_jobs.shtml
#	slurm/slurm.h.in
parents e3dcbf1f ccafaf7b
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