Skip to content
GitLab
Commit f96d9f03 authored by Moe Jette's avatar Moe Jette
Browse files

Merge branch 'slurm-2.2' 

Conflicts:
	src/slurmctld/job_mgr.c
parents d7088c5f 6f25e0cd
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