Merge pull request #22559 from pdvian/wip-24332-mimic

author Yuri Weinstein <yweinste@redhat.com>

Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)

committer GitHub <noreply@github.com>

Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)
committer GitHub <noreply@github.com>
Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)
committer	GitHub <noreply@github.com>
	Fri, 6 Jul 2018 21:42:08 +0000 (14:42 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history