From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Jul 2018 03:01:42 +0000 (-0500)
Subject: Merge PR #22974 into master
X-Git-Tag: v14.0.1~891
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7b5105d0cf52ea3ae46c8adc89c6a0c8d526327;p=ceph.git

Merge PR #22974 into master

* 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>
---

b7b5105d0cf52ea3ae46c8adc89c6a0c8d526327