Merge PR #25308 into master

author Sage Weil <sage@redhat.com>

Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)

committer Sage Weil <sage@redhat.com>

Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
author Sage Weil <sage@redhat.com>
Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
committer Sage Weil <sage@redhat.com>
Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
committer	Sage Weil <sage@redhat.com>
	Fri, 30 Nov 2018 19:19:42 +0000 (13:19 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history