]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #18995 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 30 Nov 2017 06:11:22 +0000 (22:11 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 30 Nov 2017 06:11:22 +0000 (22:11 -0800)
* refs/pull/18995/head:
client: emplace Cap in Inode caps map

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

Simple merge