Commit 459c6470 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.11'

Conflicts:
	doc/man/man1/salloc.1
	doc/man/man1/sbatch.1
	doc/man/man1/sbcast.1
	doc/man/man1/scontrol.1
	doc/man/man1/srun.1
	doc/man/man3/slurm_allocate_resources.3
	doc/man/man5/slurm.conf.5
parents cf99853a 2995b5e8
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