Merge pull request #18456 from liewegas/wip-21882-luminous

author Josh Durgin <jdurgin@redhat.com>

Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)

committer GitHub <noreply@github.com>

Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)
author Josh Durgin <jdurgin@redhat.com>
Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)
committer GitHub <noreply@github.com>
Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)
committer	GitHub <noreply@github.com>
	Wed, 25 Oct 2017 18:45:38 +0000 (11:45 -0700)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history