Commit 88220a2b authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6'

Conflicts:
	src/slurmd/slurmstepd/task.c
parents 8df024c1 bc441bef
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