]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77189f2 1ef6aec)
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)
* 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>
1  2 
src/mds/FSMap.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/FSMap.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.