]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR 16202 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:49 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:49 +0000 (22:33 -0700)
commitba548ffe2624c52bf6d451ab6934b36b91221616
tree2d7ce43d814ddc5d74a9fb54ce8425090b66244f
parent77189f270a36854318bee321c5a6e935d7603d9b
parent1ef6aec7e4b32f4df3fe53cc1cb8a3c2ad27463f
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 <pdonnell@redhat.com>
src/mds/FSMap.cc