Merge pull request #19499 from shinobu-x/wip-22402-luminous

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)

committer GitHub <noreply@github.com>

Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)
committer GitHub <noreply@github.com>
Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)
committer	GitHub <noreply@github.com>
	Thu, 1 Feb 2018 23:08:45 +0000 (15:08 -0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history