Merge pull request #34425 from smithfarm/wip-44839-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)

committer GitHub <noreply@github.com>

Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)
committer GitHub <noreply@github.com>
Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)
diff --cc src/pybind/rbd/rbd.pyx
Simple merge
diff --cc src/test/pybind/test_rbd.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)
committer	GitHub <noreply@github.com>
	Thu, 30 Apr 2020 15:19:43 +0000 (08:19 -0700)
		1	2
src/pybind/rbd/rbd.pyx	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/pybind/test_rbd.py	patch \|	diff1 \|	diff2 \|	blob \| history