]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0a2c10 ec0db68)
Merge remote-tracking branch 'origin/wip-damage-table' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:31:35 +0000 (16:31 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 8 Mar 2016 00:31:35 +0000 (16:31 -0800)
https://github.com/ceph/ceph-qa-suite/pull/782

Conflicts:
tasks/cephfs/test_scrub_checks.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.