Merge branch 'master' into wip-45901-master

author Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>

Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)

committer GitHub <noreply@github.com>

Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)
author Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)
committer GitHub <noreply@github.com>
Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)
diff --cc qa/tasks/mgr/dashboard/test_pool.py
Simple merge
diff --cc src/pybind/mgr/dashboard/controllers/cephfs.py
Simple merge
diff --cc src/pybind/mgr/dashboard/controllers/host.py
Simple merge
diff --cc src/pybind/mgr/dashboard/controllers/orchestrator.py
Simple merge
author	Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
	Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)
committer	GitHub <noreply@github.com>
	Fri, 17 Jul 2020 10:05:20 +0000 (15:35 +0530)
		1	2
qa/tasks/mgr/dashboard/test_pool.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/controllers/cephfs.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/controllers/host.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/controllers/orchestrator.py	patch \|	diff1 \|	diff2 \|	blob \| history