From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Jul 2018 12:11:48 +0000 (-0500)
Subject: Merge PR #22976 into luminous
X-Git-Tag: v12.2.7~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e599009af03f69cb212fbf384fb0b10f3ccfb661;p=ceph.git

Merge PR #22976 into luminous

* refs/pull/22976/head:
	qa/standalone/osd/ec-error-rollforward: reproduce bug 24597
	qa/standalone/osd/repro_long_log.sh: fix test
	osd/PG: do not blindly roll forward to log.head

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

e599009af03f69cb212fbf384fb0b10f3ccfb661