]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca4f10b 83800cd)
Merge PR #18039 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 30 Oct 2017 19:24:23 +0000 (12:24 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 30 Oct 2017 19:24:23 +0000 (12:24 -0700)
* refs/pull/18039/head:
mgr/dashboard: redirect away if viewed filesystem is removed
mgr/dashboard: 404 instead of 500 on missing filesystem
mds: fix FSMap copy constructor

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/FSMap.h patch | diff1 | diff2 | blob | history
src/pybind/mgr/dashboard/module.py patch | diff1 | diff2 | blob | history

diff --cc src/mds/FSMap.h
Simple merge
diff --cc src/pybind/mgr/dashboard/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.