]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36473 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Oct 2020 20:03:52 +0000 (13:03 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Oct 2020 20:03:52 +0000 (13:03 -0700)
* refs/pull/36473/head:
mds: remove snap past parents compat code

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

diff --cc src/mds/CDir.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge