Skip to content
GitLab
Commit 845e8ab9 authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-2.6' into slurm-14.03 

Conflicts:
	src/slurmd/slurmstepd/slurmstepd_job.c
parents 4b37fb39 17e4e2ac
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