Merge pull request #11337 from SUSE/wip-17060-jewel

author Loic Dachary <loic@dachary.org>

Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
author Loic Dachary <loic@dachary.org>
Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/test/librbd/image/test_mock_RefreshRequest.cc
Simple merge
diff --cc src/tools/rbd_mirror/ImageDeleter.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)
		1	2
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/image/test_mock_RefreshRequest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd_mirror/ImageDeleter.cc	patch \|	diff1 \|	diff2 \|	blob \| history