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

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

Conflicts:
	doc/man/man5/slurm.conf.5
parents 4bb805d0 d2b22169
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