Commit d469a3a8 authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	NEWS
#	configure
#	src/common/gres.c
#	src/slurmctld/read_config.c
parents f125051a c51eb875
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