]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5867292 25c75a9)
Merge pull request #21007 from rjfd/wip-dashboard-fix-py3
authorRicardo Dias <rdias@suse.com>
Mon, 26 Mar 2018 09:59:17 +0000 (10:59 +0100)
committerGitHub <noreply@github.com>
Mon, 26 Mar 2018 09:59:17 +0000 (10:59 +0100)
mgr/dashboard: fix dashboard python 3 support

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
qa/tasks/mgr/dashboard/helper.py patch | diff1 | diff2 | blob | history
src/pybind/mgr/dashboard/controllers/cephfs.py patch | diff1 | diff2 | blob | history
src/pybind/mgr/dashboard/tools.py patch | diff1 | diff2 | blob | history

diff --cc qa/tasks/mgr/dashboard/helper.py
Simple merge
diff --cc src/pybind/mgr/dashboard/tools.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.