Merge pull request #17335 from Carudy/cxw

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)

committer GitHub <noreply@github.com>

Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)
committer GitHub <noreply@github.com>
Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
diff --cc src/test/crush/CrushWrapper.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)
committer	GitHub <noreply@github.com>
	Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history