Merge pull request #24746 from smithfarm/wip-36591-luminous

author Yuri Weinstein <yweinste@redhat.com>

Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)

committer GitHub <noreply@github.com>

Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)
committer GitHub <noreply@github.com>
Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)
committer	GitHub <noreply@github.com>
	Mon, 5 Nov 2018 22:08:23 +0000 (14:08 -0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history