Merge pull request #10462 from dillaman/wip-16478

author Mykola Golub <mgolub@mirantis.com>

Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)

committer GitHub <noreply@github.com>

Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)
author Mykola Golub <mgolub@mirantis.com>
Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)
committer GitHub <noreply@github.com>
Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/tools/rbd_mirror/ImageDeleter.cc
Simple merge
author	Mykola Golub <mgolub@mirantis.com>
	Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)
committer	GitHub <noreply@github.com>
	Tue, 2 Aug 2016 17:48:07 +0000 (20:48 +0300)
		1	2
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/ImageDeleter.cc	patch \|	diff1 \|	diff2 \|	blob \| history