Merge pull request #21228 from dillaman/wip-22396-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)

committer GitHub <noreply@github.com>

Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)
committer GitHub <noreply@github.com>
Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/test/librbd/test_librbd.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)
committer	GitHub <noreply@github.com>
	Sun, 8 Apr 2018 16:25:25 +0000 (18:25 +0200)
		1	2
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history