]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #28220 from pdvian/wip-39513-mimic
authorYuri Weinstein <yweinste@redhat.com>
Wed, 17 Jul 2019 23:01:04 +0000 (16:01 -0700)
committerGitHub <noreply@github.com>
Wed, 17 Jul 2019 23:01:04 +0000 (16:01 -0700)
mimic: osd: take heartbeat_lock when calling heartbeat()

Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/osd/OSD.cc

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