Merge pull request #16096 from smithfarm/wip-19336-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)

committer GitHub <noreply@github.com>

Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)
committer GitHub <noreply@github.com>
Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)
diff --cc src/librbd/image/CreateRequest.cc
Simple merge
diff --cc src/test/librados_test_stub/LibradosTestStub.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)
committer	GitHub <noreply@github.com>
	Wed, 19 Jul 2017 12:29:31 +0000 (14:29 +0200)
		1	2
src/librbd/image/CreateRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados_test_stub/LibradosTestStub.cc	patch \|	diff1 \|	diff2 \|	blob \| history