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

Merge branch 'slurm-14.03' 

Conflicts:
	src/slurmctld/job_mgr.c
	src/slurmctld/node_scheduler.c
parents 82f9bf44 ad0590f3
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