]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cb6de1 5c143f3)
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)
* refs/pull/25593/head:
mds: create heartbeat grace config option

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/common/options.cc patch | diff1 | diff2 | blob | history
src/mds/MDSRank.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/options.cc
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.