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

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

Conflicts:
	src/plugins/select/cray/cray_config.c
parents 4cd6c0ec 38aaeaaf
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