From: Patrick Donnelly Date: Tue, 18 Jul 2017 05:33:49 +0000 (-0700) Subject: Merge PR 16202 into master X-Git-Tag: ses5-milestone9~1^2~22 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba548ffe2624c52bf6d451ab6934b36b91221616;p=ceph.git Merge PR 16202 into master * refs/remotes/upstream/pull/16202/head: doc: add some docs about 'cephfs-data-scan scan_links' mds/FSMap.cc: remember stopped mds when resetting filesystem tools/cephfs: handle removed dentries when replaying journal Reviewed-by: Patrick Donnelly --- ba548ffe2624c52bf6d451ab6934b36b91221616