From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 8 Sep 2017 18:23:15 +0000 (-0700)
Subject: Merge PR #17452 into master
X-Git-Tag: v13.0.1~984
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=490bc0050c54c4e81c28b457af30e3dd62532961;p=ceph.git

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>
---

490bc0050c54c4e81c28b457af30e3dd62532961