]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42258c6 ee2c628)
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)
* refs/pull/21668/head:
mds: include nfiles/nsubdirs of directory inode in MClientCaps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/mds/CInode.cc patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/CInode.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.