]> 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: 52d1797 3f2946a)
Merge pull request #4648 from athanatos/wip-11439
authorSamuel Just <sam.just@inktank.com>
Mon, 11 May 2015 18:09:35 +0000 (11:09 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 11 May 2015 18:09:35 +0000 (11:09 -0700)
Add separate suicide timeout configs

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.