]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41d3fdc bb41bdf)
Merge PR #27206 into master
authorSage Weil <sage@redhat.com>
Mon, 1 Apr 2019 13:37:10 +0000 (08:37 -0500)
committerSage Weil <sage@redhat.com>
Mon, 1 Apr 2019 13:37:10 +0000 (08:37 -0500)
* refs/pull/27206/head:
osd: shutdown recovery_request_timer earlier

Reviewed-by: Kefu Chai <kchai@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.