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

Merge branch 'slurm-14.11' 

Conflicts:
	slurm/slurm.h.in
	src/slurmctld/job_scheduler.c
	src/slurmd/slurmstepd/task.c
parents 6c425ca9 18bbf378
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