Merge pull request #40067 from myoungwon/wip-49726

author Samuel Just <sjust@redhat.com>

Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)

committer GitHub <noreply@github.com>

Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)
author Samuel Just <sjust@redhat.com>
Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)
committer GitHub <noreply@github.com>
Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
diff --cc src/test/librados/tier_cxx.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)
committer	GitHub <noreply@github.com>
	Mon, 12 Apr 2021 18:50:06 +0000 (11:50 -0700)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados/tier_cxx.cc	patch \|	diff1 \|	diff2 \|	blob \| history