]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #30835 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 5 Nov 2019 06:29:29 +0000 (22:29 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 5 Nov 2019 06:29:29 +0000 (22:29 -0800)
* 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>

Trivial merge