Commit 787dcbf1 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-15.08'

Conflicts:
	src/plugins/sched/backfill/backfill.c
parents 743cabc7 efd9d35e
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