Merge pull request #29242 from smithfarm/wip-38277-mimic

author Yuri Weinstein <yweinste@redhat.com>

Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)

committer GitHub <noreply@github.com>

Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)
committer GitHub <noreply@github.com>
Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)
committer	GitHub <noreply@github.com>
	Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history