Merge pull request #28851 from jdurgin/wip-18096-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)

committer GitHub <noreply@github.com>

Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)
committer GitHub <noreply@github.com>
Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)
committer	GitHub <noreply@github.com>
	Thu, 25 Jul 2019 21:45:31 +0000 (14:45 -0700)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history