]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41d7685 d8a6715)
Merge PR #35848 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 13 Jul 2020 18:13:43 +0000 (11:13 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 13 Jul 2020 18:13:43 +0000 (11:13 -0700)
commit2f9a9ecb076eaab07645549e31cce70f3fbe2dd8
treed346db197de5f81c3fbadeff4831655b969e10c7tree | snapshot
parent41d76856fa69f5ee8eab199b11b0c45a983fd1f2commit | diff
parentd8a6715b0740bebfe7922391868aae2df304db6bcommit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.