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

Merge PR #17456 into master

* refs/remotes/upstream/pull/17456/head:
	mds: print subtrees only after merge

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

5f99d9d53cfdd7d7e43f64e9f4b1ae7836084b41