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

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

Conflicts:
	src/plugins/task/cray/task_cray.c
parents c9195388 9c99c4cd
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