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

Merge branch 'slurm-15.08' of https://github.com/SchedMD/slurm into slurm-15.08 

Conflicts:
	NEWS
parents 79343222 8e66e267
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