]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit490bc0050c54c4e81c28b457af30e3dd62532961
treeebd086233b2ebc0ee0f49a394f34a4a0a0bfb0c7
parent353b1311c3dd1955a19ebb7c94d338425476235a
parent178ca58fec2d820f61724d223addac1c4fa67086
Merge PR #17452 into master

* 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>
src/mds/MDCache.cc
src/mds/Migrator.cc