From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Jan 2020 17:05:29 +0000 (-0600)
Subject: Merge PR #32851 into master
X-Git-Tag: v15.1.0~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e33f610af9ddb094deb5efa817dfd072b8f23ead;p=ceph.git

Merge PR #32851 into master

* refs/pull/32851/head:
	qa/standalone/osd/osd-backfill-recovery-log.sh: fix TEST_backfill_log_2
	qa/standalone/osd/osd-backfill-recovery-log.sh: fix TEST_backfill_log_1

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

e33f610af9ddb094deb5efa817dfd072b8f23ead