Merge pull request #17889 from smithfarm/wip-21372-luminous

author Karol Mroz <kmroz@suse.de>

Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)

committer GitHub <noreply@github.com>

Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)
author Karol Mroz <kmroz@suse.de>
Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)
committer GitHub <noreply@github.com>
Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Karol Mroz <kmroz@suse.de>
	Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)
committer	GitHub <noreply@github.com>
	Tue, 31 Oct 2017 17:26:42 +0000 (10:26 -0700)
		1	2
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history