]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #21668 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 7 May 2018 22:43:34 +0000 (15:43 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 7 May 2018 22:43:34 +0000 (15:43 -0700)
commit54d514a52211b2c1d97ca21943cf2c6a81b58208
tree56223d1f7a65a88eace86668b42727e208c94fc8
parent42258c637add92deae14f7bd32806f835db07a80
parentee2c628f6783954e9b25fab8ac9b572a58666a91
Merge PR #21668 into master

* refs/pull/21668/head:
mds: include nfiles/nsubdirs of directory inode in MClientCaps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/client/Client.cc
src/mds/CInode.cc