Merge pull request #21330 from tchaikov/wip-23610-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)

committer GitHub <noreply@github.com>

Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)
committer GitHub <noreply@github.com>
Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)
committer	GitHub <noreply@github.com>
	Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history