Skip to content
GitLab
Commit 1d61275c authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.03' 

Conflicts:
	doc/html/gres.shtml
	doc/man/man5/gres.conf.5
parents 5b1d4607 4f818bcc
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