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

Merge remote-tracking branch 'origin/slurm-15.08' 

# Conflicts:
#	src/plugins/burst_buffer/cray/burst_buffer_cray.c
parents c37f421d 264b950d
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