]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit299fc82ded6d0831089b11b568492829d98bada7
treea67c62628536b7e2c7e57117779aee325fae6fb8
parentdd460032dd9cde14b629b8267606702684c67c66
parent4014441b8d9ad446f01c3a59d6720bb888457330
Merge PR #24505 into master

* refs/pull/24505/head:
mds: wait shorter intervals if beacon not sent

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