]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #37034 from smithfarm/wip-46520-octopus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 5 Oct 2020 23:32:48 +0000 (16:32 -0700)
committerGitHub <noreply@github.com>
Mon, 5 Oct 2020 23:32:48 +0000 (16:32 -0700)
commit252f5bdf4bc8b2da6b51bac09e810d6dbf8734ba
treeddb186f53aac4627a43703e13b2dc38abff3fc8d
parentf79a332d19518bf8fcd3a0bd66913a6900d24fce
parent57e79eca25bcb027f27b0c029f06c8b8764ab502
Merge pull request #37034 from smithfarm/wip-46520-octopus

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

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/CDir.cc
src/mds/MDCache.cc