Merge pull request #32007 from tchaikov/wip-osd-cleanup

author Kefu Chai <kchai@redhat.com>

Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)

committer GitHub <noreply@github.com>

Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)
committer GitHub <noreply@github.com>
Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)
committer	GitHub <noreply@github.com>
	Tue, 10 Dec 2019 09:18:03 +0000 (17:18 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history