Merge pull request #14875 from dillaman/wip-rbd-trash-parent

author Mykola Golub <mgolub@mirantis.com>

Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)

committer GitHub <noreply@github.com>

Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)
author Mykola Golub <mgolub@mirantis.com>
Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)
committer GitHub <noreply@github.com>
Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)
diff --cc src/pybind/rbd/rbd.pyx
Simple merge
diff --cc src/test/librbd/test_librbd.cc
Simple merge
author	Mykola Golub <mgolub@mirantis.com>
	Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2017 12:24:30 +0000 (15:24 +0300)
		1	2
src/pybind/rbd/rbd.pyx	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_librbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history