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

Merge branch 'slurm-2.6' 

Conflicts:
	src/plugins/select/cray/select_cray.c
parents 07ec350f ac64f883
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