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

Merge branch 'slurm-14.03' 

Conflicts:
	doc/html/gres.shtml
	src/slurmctld/slurmctld.h
parents c6828f2d c1f6b7b4
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