Merge PR #27575 into master

author Sage Weil <sage@redhat.com>

Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
author Sage Weil <sage@redhat.com>
Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history