]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.