]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24490 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Nov 2018 21:03:02 +0000 (13:03 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Nov 2018 21:03:02 +0000 (13:03 -0800)
* refs/pull/24490/head:
mds: flush dirty dirfrags that weren't logged when deactivating mds
mds: use MDlog::trim_all() to trim log when deactivating mds
mds: don't cap log when there are replicated objects

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

Trivial merge