Merge pull request #11460 from dachary/wip-17482-jewel

author Loic Dachary <loic@dachary.org>

Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +0200)

committer GitHub <noreply@github.com>

Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +0200)
author Loic Dachary <loic@dachary.org>
Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +0200)
committer GitHub <noreply@github.com>
Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +0200)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/test/librbd/image/test_mock_RefreshRequest.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +0200)
committer	GitHub <noreply@github.com>
	Thu, 20 Oct 2016 14:27:36 +0000 (16:27 +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