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

Merge remote-tracking branch 'origin/slurm-15.08' into slurm-16.05 

# Conflicts:
#	src/plugins/select/cray/select_cray.c
#	testsuite/expect/test1.84
parents 21eed55d 2959a1e6
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