Merge pull request #30824 from dillaman/wip-41629-nautilus

author Jason Dillaman <dillaman@redhat.com>

Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)

committer GitHub <noreply@github.com>

Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)
author Jason Dillaman <dillaman@redhat.com>
Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)
committer GitHub <noreply@github.com>
Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)
diff --cc src/librbd/api/Image.cc
Simple merge
diff --cc src/librbd/librbd.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)
committer	GitHub <noreply@github.com>
	Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)
		1	2
src/librbd/api/Image.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history