Skip to content
GitLab
Commit 394d71cf authored by alejluther's avatar alejluther
Browse files

Merge branch 'master' of https://github.com/SchedMD/slurm 

Conflicts:
	src/plugins/sched/backfill/backfill.c
	src/slurmctld/slurmctld.h
	src/slurmctld/statistics.c
parents 419865c8 963bbfb9
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