]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33662 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 5 Mar 2020 04:01:39 +0000 (20:01 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 5 Mar 2020 04:01:39 +0000 (20:01 -0800)
* refs/pull/33662/head:
mds: handle ceph_assert on blacklisting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge