]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #36260 from rhcs-dashboard/wip-46672-octopus
authorLenz Grimmer <lgrimmer@suse.com>
Fri, 21 Aug 2020 09:13:32 +0000 (11:13 +0200)
committerGitHub <noreply@github.com>
Fri, 21 Aug 2020 09:13:32 +0000 (11:13 +0200)
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
1  2 
qa/tasks/mgr/dashboard/test_pool.py
qa/tasks/mgr/dashboard/test_rbd.py
src/pybind/mgr/dashboard/controllers/cephfs.py
src/pybind/mgr/dashboard/controllers/host.py

Simple merge
Simple merge