Skip to content
GitLab
Commit 2042f2ee authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-16.05' 

Conflicts:
	src/plugins/burst_buffer/common/burst_buffer_common.h
parents d3e67862 85983130
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