]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR 16153 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:45 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:45 +0000 (22:33 -0700)
* refs/remotes/upstream/pull/16153/head:
mds: fixup may be an unclaimed tick_event

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSDaemon.cc

Simple merge