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

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

# Conflicts:
#	src/slurmd/slurmd/req.c
#	src/srun/libsrun/allocate.c
parents cc23cd64 c16581f6
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