Merge pull request #39683 from maydaycc/wip-49487

author Kefu Chai <kchai@redhat.com>

Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)

committer GitHub <noreply@github.com>

Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)
author Kefu Chai <kchai@redhat.com>
Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)
committer GitHub <noreply@github.com>
Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)
committer	GitHub <noreply@github.com>
	Wed, 24 Mar 2021 12:21:11 +0000 (20:21 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history