Skip to content
GitLab
Commit 6c71e82d authored by Brian Christiansen's avatar Brian Christiansen
Browse files

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

Conflicts:
	src/plugins/task/cray/task_cray.c
parents 1e578c90 87737895
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