Merge pull request #29241 from smithfarm/wip-38206-mimic

author Yuri Weinstein <yweinste@redhat.com>

Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)

committer GitHub <noreply@github.com>

Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)
committer GitHub <noreply@github.com>
Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)
committer	GitHub <noreply@github.com>
	Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history