Merge PR #40394 into master

author Sage Weil <sage@newdream.net>

Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)

committer Sage Weil <sage@newdream.net>

Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
author Sage Weil <sage@newdream.net>
Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
committer Sage Weil <sage@newdream.net>
Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
committer	Sage Weil <sage@newdream.net>
	Fri, 26 Mar 2021 20:41:31 +0000 (16:41 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history