Skip to content
GitLab
Commit 8995a04a authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.5' 

Conflicts:
	NEWS
	src/slurmctld/controller.c
	src/slurmctld/job_scheduler.c
parents 7d4a8441 941a5ac9
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