]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR 16041 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:43 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:43 +0000 (22:33 -0700)
commit2f6ae4726c339f10f71d2569535a220e3392b5ee
tree24235055545204de8f391cad03a91c4067a89327
parentbc58d6aa92dcb5b99f2522cd5d10a3b62fdc23be
parent4fdbd854ff736bfa747ec5042aae7867ccff69d8
Merge PR 16041 into master

* refs/remotes/upstream/pull/16041/head:
mds: “*dir” print repeatedly
MDS: tick_event repeated assignment

Reviewed-by: Zheng Yan <zyan@redhat.com>
src/mds/MDSDaemon.cc
src/mds/Server.cc