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

Merge remote-tracking branch 'origin/slurm-2.4' 

Conflicts:
	src/common/node_select.c
	src/plugins/select/cray/other_select.c
parents 97cfcd56 07843fd3
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