Merge pull request #27943 from smithfarm/wip-38879-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)

committer GitHub <noreply@github.com>

Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)
committer GitHub <noreply@github.com>
Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PGLog.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)
committer	GitHub <noreply@github.com>
	Wed, 8 May 2019 19:18:18 +0000 (12:18 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.h	patch \|	diff1 \|	diff2 \|	blob \| history