]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit2e44b871419709bc5f07507bf376c7192972889f
tree76572a3d4f2c1a3fb925e4467f046ce79b41e3e8
parent3ed7cc2cbcbb4cf2b9d95db66c989a29224e584d
parent5224d94f4b2c67bd650b896d3e07d3332b11fc41
Merge PR #19263 into master

* 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>
src/common/options.cc
src/mds/CDir.cc
src/mds/CInode.cc
src/mds/CInode.h