]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19263 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Feb 2018 22:43:32 +0000 (14:43 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Feb 2018 22:43:32 +0000 (14:43 -0800)
* refs/pull/19263/head:
qa: ignore bad backtrace cluster wrn
qa/cephfs: Add tests to validate scrub functionality
cephfs: Add option to load invalid metadata from disk
cephfs: Reset scrub data when inodes move

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/common/options.cc
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/CInode.h

Simple merge
diff --cc src/mds/CDir.cc
Simple merge
Simple merge
Simple merge