]> 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: fe3ead1 7863d7c)
Merge PR #27729 into master
authorSage Weil <sage@redhat.com>
Fri, 26 Apr 2019 18:23:36 +0000 (13:23 -0500)
committerSage Weil <sage@redhat.com>
Fri, 26 Apr 2019 18:23:36 +0000 (13:23 -0500)
* refs/pull/27729/head:
osd: take heartbeat_lock when calling heartbeat()

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
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.