From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 13 Feb 2018 22:43:32 +0000 (-0800)
Subject: Merge PR #19263 into master
X-Git-Tag: v13.0.2~279
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2e44b871419709bc5f07507bf376c7192972889f;p=ceph.git

Merge PR #19263 into master

* refs/pull/19263/head:
	qa: ignore bad backtrace cluster wrn
	qa/cephfs: Add tests to validate scrub functionality
	cephfs: Add option to load invalid metadata from disk
	cephfs: Reset scrub data when inodes move

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

2e44b871419709bc5f07507bf376c7192972889f