]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18753 from shinobu-x/wip-21697-luminous
authorYuri Weinstein <yuri.weinstein@gmail.com>
Tue, 23 Jan 2018 23:06:19 +0000 (15:06 -0800)
committerGitHub <noreply@github.com>
Tue, 23 Jan 2018 23:06:19 +0000 (15:06 -0800)
luminous: OSDService::recovery_need_sleep read+updated without locking

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge