Skip to content
GitLab
Commit f063f761 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-15.08' into slurm-16.05 

Conflicts:
	src/plugins/select/cray/select_cray.c
parents f044abc6 cdc3214e
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