Merge pull request #36126 from ShyamsundarR/wip-46528-octopus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)

committer GitHub <noreply@github.com>

Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)
committer GitHub <noreply@github.com>
Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)
diff --cc qa/tasks/cephfs/test_volumes.py
Simple merge
diff --cc src/pybind/mgr/volumes/fs/volume.py
Simple merge
diff --cc src/pybind/mgr/volumes/module.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)
committer	GitHub <noreply@github.com>
	Tue, 25 Aug 2020 22:08:20 +0000 (15:08 -0700)
		1	2
qa/tasks/cephfs/test_volumes.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/volumes/fs/volume.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/volumes/module.py	patch \|	diff1 \|	diff2 \|	blob \| history