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

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

# Conflicts:
#	src/slurmctld/job_mgr.c
#	src/slurmctld/proc_req.c
#	src/slurmd/slurmd/req.c
#	testsuite/expect/test21.39
parents 2a46955b d4982cd1
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