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

Merge branch 'slurm-15.08' 

Conflicts:
	META
	NEWS
	doc/man/man1/srun.1
	slurm.spec
	src/sbcast/sbcast.c
parents 5c745f30 a42544f7
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