Merge pull request #22809 from tchaikov/wip-with-seastar

author Kefu Chai <tchaikov@gmail.com>

Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)

committer GitHub <noreply@github.com>

Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)
committer GitHub <noreply@github.com>
Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)
diff --cc install-deps.sh
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)
committer	GitHub <noreply@github.com>
	Sat, 14 Jul 2018 09:36:20 +0000 (17:36 +0800)
		1	2
install-deps.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history