Merge pull request #18405 from dillaman/wip-21849

author Mykola Golub <to.my.trociny@gmail.com>

Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)

committer GitHub <noreply@github.com>

Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)
author Mykola Golub <to.my.trociny@gmail.com>
Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)
committer GitHub <noreply@github.com>
Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)
diff --cc src/common/options.cc
Simple merge
diff --cc src/librbd/ImageCtx.cc
Simple merge
diff --cc src/librbd/io/ImageRequest.cc
Simple merge
author	Mykola Golub <to.my.trociny@gmail.com>
	Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)
committer	GitHub <noreply@github.com>
	Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/ImageCtx.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/io/ImageRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history