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

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

# Conflicts:
#	src/common/slurm_acct_gather.c
#	src/plugins/sched/backfill/backfill.c
#	src/slurmctld/node_scheduler.c
parents d96e8f09 129820eb
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