]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #17456 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Sep 2017 18:23:17 +0000 (11:23 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Sep 2017 18:23:17 +0000 (11:23 -0700)
* refs/remotes/upstream/pull/17456/head:
mds: print subtrees only after merge

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

Simple merge