Merge pull request #26206 from neha-ojha/wip-37902-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)

committer GitHub <noreply@github.com>

Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)
committer GitHub <noreply@github.com>
Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)
committer	GitHub <noreply@github.com>
	Wed, 6 Feb 2019 04:08:40 +0000 (20:08 -0800)
		1	2
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history