Merge pull request #37316 from trociny/wip-46803-2

author Jason Dillaman <dillaman@redhat.com>

Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)

committer GitHub <noreply@github.com>

Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)
author Jason Dillaman <dillaman@redhat.com>
Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)
committer GitHub <noreply@github.com>
Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)
diff --cc src/librbd/ImageWatcher.cc
Simple merge
diff --cc src/librbd/ImageWatcher.h
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)
committer	GitHub <noreply@github.com>
	Thu, 1 Oct 2020 15:01:28 +0000 (11:01 -0400)
		1	2
src/librbd/ImageWatcher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/ImageWatcher.h	patch \|	diff1 \|	diff2 \|	blob \| history