Merge pull request #30865 from zy751713126/config_pool

author Jason Dillaman <dillaman@redhat.com>

Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)

committer GitHub <noreply@github.com>

Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)
author Jason Dillaman <dillaman@redhat.com>
Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)
committer GitHub <noreply@github.com>
Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)
diff --cc src/pybind/rbd/rbd.pyx
Simple merge
diff --cc src/test/pybind/test_rbd.py
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)
committer	GitHub <noreply@github.com>
	Wed, 16 Oct 2019 01:05:27 +0000 (21:05 -0400)
		1	2
src/pybind/rbd/rbd.pyx	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/pybind/test_rbd.py	patch \|	diff1 \|	diff2 \|	blob \| history