]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2e0522 33dd2c5)
Merge PR #20457 into luminous
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 27 Mar 2018 22:46:29 +0000 (15:46 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 27 Mar 2018 22:46:29 +0000 (15:46 -0700)
* refs/pull/20457/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 patch | diff1 | diff2 | blob | history

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