]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #21769 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:48 +0000 (14:57 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:48 +0000 (14:57 -0700)
* refs/pull/21769/head:
mds: properly reconnect client caps after loading inodes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Server.cc

Simple merge
Simple merge
Simple merge