]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #17452 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Sep 2017 18:23:15 +0000 (11:23 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Sep 2017 18:23:15 +0000 (11:23 -0700)
* refs/remotes/upstream/pull/17452/head:
Make standby-replay mds not migrate empty subtree when trimming cache
Make standby-replay mds avoid initiating subtree export

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/Migrator.cc

Simple merge
Simple merge