Merge pull request #18398 from smithfarm/wip-21783-luminous

author Sage Weil <sage@newdream.net>

Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)

committer GitHub <noreply@github.com>

Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)
author Sage Weil <sage@newdream.net>
Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)
committer GitHub <noreply@github.com>
Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)
committer	GitHub <noreply@github.com>
	Sat, 21 Oct 2017 04:09:17 +0000 (23:09 -0500)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history