Merge pull request #18357 from asomers/have_libaio

author Kefu Chai <tchaikov@gmail.com>

Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)

committer GitHub <noreply@github.com>

Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)
committer GitHub <noreply@github.com>
Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/os/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)
committer	GitHub <noreply@github.com>
	Sat, 21 Oct 2017 02:38:37 +0000 (10:38 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history