Merge pull request #10050 from dachary/wip-16459-jewel

author Loic Dachary <loic@dachary.org>

Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)

committer GitHub <noreply@github.com>

Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)
author Loic Dachary <loic@dachary.org>
Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)
committer GitHub <noreply@github.com>
Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)
diff --cc src/librbd/ImageWatcher.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 Aug 2016 06:26:40 +0000 (08:26 +0200)
		1	2
src/librbd/ImageWatcher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history