Merge pull request #11808 from trociny/wip-17010

author Jason Dillaman <dillaman@redhat.com>

Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)

committer GitHub <noreply@github.com>

Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)
author Jason Dillaman <dillaman@redhat.com>
Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)
committer GitHub <noreply@github.com>
Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)
diff --cc src/librbd/image/CreateRequest.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)
committer	GitHub <noreply@github.com>
	Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)
		1	2
src/librbd/image/CreateRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history