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

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

# Conflicts:
#	doc/man/man5/slurm.conf.5
#	src/plugins/sched/backfill/backfill.c
#	src/slurmctld/job_scheduler.c
parents 1d673a34 b24f673e
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