]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22974 into master
authorSage Weil <sage@redhat.com>
Thu, 12 Jul 2018 03:01:42 +0000 (22:01 -0500)
committerSage Weil <sage@redhat.com>
Thu, 12 Jul 2018 03:01:42 +0000 (22:01 -0500)
* refs/pull/22974/head:
qa/standalone/osd/ec-error-rollforward: reproduce bug 24597
qa/suites/rados/thrash-erasure-code: add many deletes workload
qa/standalone/osd/repro_long_log.sh: fix test
osd/PG: do not blindly roll forward to log.head

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge