Skip to content
GitLab
Commit 6cc8e458 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.03' into slurm-14.11 

Conflicts:
	src/plugins/task/cray/task_cray.c
parents 4741371b af848be6
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