]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1db3f88 387746c)
Merge PR #29735 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 16 Sep 2019 20:02:03 +0000 (13:02 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 16 Sep 2019 20:02:03 +0000 (13:02 -0700)
* refs/pull/29735/head:
mgr/volumes: cluster log when a purge thread bails out
mgr/volumes: retry purging trash entries on intermittent error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/pybind/mgr/volumes/fs/volume.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/volumes/fs/volume.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.