From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 22 Oct 2019 04:18:36 +0000 (-0700)
Subject: Merge PR #30971 into master
X-Git-Tag: v15.1.0~1206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=581be7595b408b1cf6da99c9a7a82a7dfbf21df0;p=ceph-ci.git

Merge PR #30971 into master

* refs/pull/30971/head:
	qa: whitelist "Error recovering journal" for cephfs-data-scan

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

581be7595b408b1cf6da99c9a7a82a7dfbf21df0