Skip to content
GitLab
Commit 3f24195a authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.5' 

Conflicts:
	src/db_api/cluster_report_functions.c
	src/plugins/sched/backfill/backfill.c
parents 465fc898 4cb6137c
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