Merge pull request #10766 from liewegas/wip-bluestore-trivial

author Sage Weil <sage@redhat.com>

Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)

committer GitHub <noreply@github.com>

Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)
author Sage Weil <sage@redhat.com>
Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)
committer GitHub <noreply@github.com>
Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)
committer	GitHub <noreply@github.com>
	Fri, 19 Aug 2016 17:21:46 +0000 (12:21 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history