Merge pull request #24660 from tchaikov/wip-crimson-cleanup

author Kefu Chai <tchaikov@gmail.com>

Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)

committer GitHub <noreply@github.com>

Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)
committer GitHub <noreply@github.com>
Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)
diff --cc src/crimson/CMakeLists.txt
Simple merge
diff --cc src/crimson/mon/MonClient.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)
committer	GitHub <noreply@github.com>
	Thu, 18 Oct 2018 13:57:56 +0000 (21:57 +0800)
		1	2
src/crimson/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/crimson/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history