Merge pull request #17214 from tchaikov/wip-luminous-pr-17014

author Sage Weil <sage@newdream.net>

Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)

committer GitHub <noreply@github.com>

Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)
author Sage Weil <sage@newdream.net>
Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)
committer GitHub <noreply@github.com>
Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)
diff --cc src/crush/CrushCompiler.cc
Simple merge
diff --cc src/crush/CrushWrapper.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)
committer	GitHub <noreply@github.com>
	Fri, 25 Aug 2017 02:30:46 +0000 (21:30 -0500)
		1	2
src/crush/CrushCompiler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history