Merge pull request #23870 from smithfarm/wip-32108-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)

committer GitHub <noreply@github.com>

Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)
committer GitHub <noreply@github.com>
Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)
diff --cc src/osd/PGBackend.h
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)
committer	GitHub <noreply@github.com>
	Wed, 5 Sep 2018 21:39:15 +0000 (14:39 -0700)
		1	2
src/osd/PGBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history