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

Merge branch 'slurm-15.08' 

Conflicts:
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
parents 78b13ab2 5708037d
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