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

Merge branch 'slurm-14.03' into slurm-14.11 

Conflicts:
	src/slurmd/slurmstepd/task.c
	src/squeue/print.c
parents 717c9ec5 836f7256
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