]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 378fed3 f75d832)
Merge pull request #31657 from liewegas/fix-merge-vs-backoff
authorNeha Ojha <nojha@redhat.com>
Fri, 22 Nov 2019 19:47:49 +0000 (11:47 -0800)
committerGitHub <noreply@github.com>
Fri, 22 Nov 2019 19:47:49 +0000 (11:47 -0800)
osd: release backoffs during merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.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.