Merge pull request #13192 from liewegas/wip-bluestore-min-alloc-size

author Sage Weil <sage@newdream.net>

Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)

committer GitHub <noreply@github.com>

Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)
author Sage Weil <sage@newdream.net>
Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)
committer GitHub <noreply@github.com>
Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)
committer	GitHub <noreply@github.com>
	Thu, 2 Feb 2017 14:56:09 +0000 (08:56 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history