Skip to content
GitLab
Commit 33a97500 authored by jette's avatar jette
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	src/plugins/sched/backfill/backfill.c
parents 43915d7a 1a4b5983
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