Skip to content
GitLab
Commit 7575bff2 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
parents 9e4ce8b8 3813f33c
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