Merge pull request #13066 from liewegas/wip-aio-read

author Sage Weil <sage@redhat.com>

Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)

committer GitHub <noreply@github.com>

Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)
author Sage Weil <sage@redhat.com>
Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)
committer GitHub <noreply@github.com>
Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/KernelDevice.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)
committer	GitHub <noreply@github.com>
	Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/KernelDevice.cc	patch \|	diff1 \|	diff2 \|	blob \| history