Merge pull request #42096 from varshar16/wip-nfs-backport-june

author Yuri Weinstein <yweinste@redhat.com>

Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)

committer GitHub <noreply@github.com>

Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)
committer GitHub <noreply@github.com>
Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)
diff --cc src/pybind/mgr/dashboard/services/access_control.py
Simple merge
diff --cc src/pybind/mgr/dashboard/tests/test_access_control.py
Simple merge
diff --cc src/pybind/mgr/mgr_module.py
Simple merge
diff --cc src/pybind/mgr/nfs/cluster.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)
committer	GitHub <noreply@github.com>
	Tue, 24 Aug 2021 21:50:20 +0000 (14:50 -0700)
		1	2
src/pybind/mgr/dashboard/services/access_control.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/tests/test_access_control.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/mgr_module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/nfs/cluster.py	patch \|	diff1 \|	diff2 \|	blob \| history