Merge pull request #17058 from xiexingguo/wip-crush-compiler

author Kefu Chai <tchaikov@gmail.com>

Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)

committer GitHub <noreply@github.com>

Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)
committer GitHub <noreply@github.com>
Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)
diff --cc src/crush/CrushCompiler.cc
Simple merge
diff --cc src/crush/CrushWrapper.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)
committer	GitHub <noreply@github.com>
	Thu, 24 Aug 2017 15:05:58 +0000 (23:05 +0800)
		1	2
src/crush/CrushCompiler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history