]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19060 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Nov 2017 21:39:19 +0000 (13:39 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 22 Nov 2017 21:39:19 +0000 (13:39 -0800)
* refs/pull/19060/head:
client: anchor Inode while trimming caps

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

Simple merge