From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 13 Jul 2020 18:13:43 +0000 (-0700)
Subject: Merge PR #35848 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~686
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f9a9ecb076eaab07645549e31cce70f3fbe2dd8;p=ceph-ci.git

Merge PR #35848 into master

* refs/pull/35848/head:
	mds: do not submit omap_rm_keys if the dir is the basedir of merge.

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

2f9a9ecb076eaab07645549e31cce70f3fbe2dd8