Commit 0ba5465d authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.11'

Conflicts:
	RELEASE_NOTES
parents 25c38393 4499f1b9
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