Merge pull request #23211 from neha-ojha/wip-24988-luminous

author Yuri Weinstein <yweinste@redhat.com>

Wed, 12 Sep 2018 15:24:09 +0000 (08:24 -0700)

committer GitHub <noreply@github.com>

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