Merge pull request #35130 from rzarzynski/wip-crimson-backfill

author Kefu Chai <kchai@redhat.com>

Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)

committer GitHub <noreply@github.com>

Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)
author Kefu Chai <kchai@redhat.com>
Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)
committer GitHub <noreply@github.com>
Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)
committer	GitHub <noreply@github.com>
	Thu, 16 Jul 2020 08:29:29 +0000 (16:29 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history