]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e684abc 6aba0ab)
Merge pull request #2650 from ceph/wip-9128
authorSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:04:42 +0000 (11:04 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:04:42 +0000 (11:04 -0700)
Add reset_tp_timeout in long loop in add_source_info for suicide timeout

Reviewed-by: Samuel Just <sam.just@inktank.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/PG.h patch | diff1 | diff2 | blob | history

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