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

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

# Conflicts:
#	doc/man/man1/scontrol.1
#	doc/man/man5/slurm.conf.5
#	src/common/gres.c
parents ae6d39fe dfb899a6
Expand all 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