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

Merge remote-tracking branch 'origin/slurm-17.11' into slurm-18.08 

# Conflicts:
#	src/plugins/mpi/pmi2/setup.c
parents ee281387 0d4b9b7e
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