Commit 68c5fd63 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6'

Conflicts:
	RELEASE_NOTES
parents dddc8f94 29fda2ab
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