]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22073 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 May 2018 04:36:50 +0000 (21:36 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 May 2018 04:36:50 +0000 (21:36 -0700)
* refs/pull/22073/head:
client: delay dentry trimming until after cap traversal
qa: test for trim_caps segfault for trimmed dentries

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/client/Client.cc

Simple merge