Merge pull request #23817 from pdvian/wip-26992-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -0700)

committer GitHub <noreply@github.com>

Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -0700)
committer GitHub <noreply@github.com>
Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -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>
	Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -0700)
committer	GitHub <noreply@github.com>
	Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -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