]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit941807d88e7845c19e5b0698195153fca630825a
treea18f536dbc2e913da288cc8a116c73171e9d34ef
parent378fed3aa00e2292c6a62768784f5885de69e591
parentf75d8327277012db70c2ca00991decacf29b1b6a
Merge pull request #31657 from liewegas/fix-merge-vs-backoff

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>
src/osd/OSD.cc