]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24505 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 16 Oct 2018 14:52:54 +0000 (07:52 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 16 Oct 2018 14:52:54 +0000 (07:52 -0700)
* refs/pull/24505/head:
mds: wait shorter intervals if beacon not sent

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

Trivial merge