]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34144 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 18 May 2020 22:10:56 +0000 (15:10 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 18 May 2020 22:10:56 +0000 (15:10 -0700)
* refs/pull/34144/head:
Filer: Add error handler in _do_purge_range()
mds: Handle blacklisted error in purge queue

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

Trivial merge