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

Merge branch 'slurm-2.4' 

Conflicts:
	src/slurmctld/job_scheduler.c
parents ccdd0b1f 27ccc04d
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