From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 5 Nov 2019 06:29:29 +0000 (-0800)
Subject: Merge PR #30835 into master
X-Git-Tag: v15.1.0~1043
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cf2c39ec9d6168549cee6d3570ddb39373e804a1;p=ceph-ci.git

Merge PR #30835 into master

* refs/pull/30835/head:
	mds: no assert on frozen dir when scrub path

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

cf2c39ec9d6168549cee6d3570ddb39373e804a1