Merge pull request #30291 from tchaikov/wip-mimic-41447

author Yuri Weinstein <yweinste@redhat.com>

Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)

committer GitHub <noreply@github.com>

Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)
committer GitHub <noreply@github.com>
Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)
committer	GitHub <noreply@github.com>
	Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history