]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #25593 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Jan 2019 01:40:53 +0000 (17:40 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Jan 2019 01:40:53 +0000 (17:40 -0800)
commit33a5f4b723167cca0d02c7479b4ee5b7fc862341
tree41843583fab4ff62b8578dccf7f47d38bdaa843e
parent8cb6de178e636ca271445ffe6b284e086f9c523c
parent5c143f3039c1967ca83d8a0cce35bf2a12509aef
Merge PR #25593 into master

* refs/pull/25593/head:
mds: create heartbeat grace config option

Reviewed-by: Zheng Yan <zyan@redhat.com>
src/common/options.cc
src/mds/MDSRank.cc