]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24050 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 25 Oct 2018 18:47:24 +0000 (11:47 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 25 Oct 2018 18:47:24 +0000 (11:47 -0700)
* refs/pull/24050/head:
Revert "mds: adjust export size after renaming directory into freezing subtree"
mds: cleanup nested auth pins tracking

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

Simple merge
Simple merge
Simple merge
Simple merge