Skip to content
GitLab
Commit aa26e21b authored by Danny Auble's avatar Danny Auble
Browse files

Merge github.com:chaos/slurm 

Conflicts:
	src/plugins/select/cons_res/select_cons_res.c
	src/plugins/select/linear/select_linear.c
parents aba88ffb b12b0d1c
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