Merge pull request #10684 from dillaman/wip-16904-jewel

author Loic Dachary <loic@dachary.org>

Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)

committer GitHub <noreply@github.com>

Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)
author Loic Dachary <loic@dachary.org>
Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)
committer GitHub <noreply@github.com>
Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)
diff --cc src/librbd/ImageWatcher.cc
Simple merge
diff --cc src/test/librbd/fsx.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)
committer	GitHub <noreply@github.com>
	Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)
		1	2
src/librbd/ImageWatcher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/fsx.cc	patch \|	diff1 \|	diff2 \|	blob \| history