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

Merge branch 'bb_pools' 

Conflicts:
	NEWS
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
	src/plugins/burst_buffer/generic/burst_buffer_generic.c
parents fc1636f3 56512f6d
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