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

Merge branch 'slurm-14.11' 

Conflicts:
	doc/man/man5/slurm.conf.5
	src/plugins/select/cons_res/job_test.c
parents 5671bde2 f2a08ce7
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