From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 27 Jul 2020 15:32:43 +0000 (-0700)
Subject: Merge pull request #36178 from smithfarm/wip-46521-nautilus
X-Git-Tag: v14.2.11~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bacea0ebd28a84e5e116a10eb7c3d4ac9187ecf1;p=ceph.git

Merge pull request #36178 from smithfarm/wip-46521-nautilus

nautilus: mds: do not submit omap_rm_keys if the dir is the basedir of merge.

Reviewed-by: Ramana Raja <rraja@redhat.com>
---

bacea0ebd28a84e5e116a10eb7c3d4ac9187ecf1