Merge pull request #35256 from Vicente-Cheng/wip-45680-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)

committer GitHub <noreply@github.com>

Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)
committer GitHub <noreply@github.com>
Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)
diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge
diff --cc src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py
Simple merge
diff --cc src/pybind/mgr/volumes/fs/volume.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)
committer	GitHub <noreply@github.com>
	Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)
		1	2
qa/tasks/cephfs/test_volumes.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/volumes/fs/volume.py	patch \|	diff1 \|	diff2 \|	blob \| history