Merge pull request #40153 from rzarzynski/wip-osd-obclock-cleanup

author Kefu Chai <kchai@redhat.com>

Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)

committer GitHub <noreply@github.com>

Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)
committer GitHub <noreply@github.com>
Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)
committer	GitHub <noreply@github.com>
	Tue, 16 Mar 2021 14:04:32 +0000 (22:04 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history