Merge pull request #13168 from trociny/wip-18550-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)

committer GitHub <noreply@github.com>

Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)
committer GitHub <noreply@github.com>
Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/test/librbd/test_librbd.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)
committer	GitHub <noreply@github.com>
	Tue, 31 Jan 2017 13:59:04 +0000 (14:59 +0100)
		1	2
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history