]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd2520707e002d711caa632d4641ba53db009c305
tree83df2035ff5474538cd2aaade5383136e38b7fc9tree | snapshot
parentfe3ead18029ca4a386d42d108d132ce33561bea0commit | diff
parent7863d7c6c49347db97a6bca36f63fc35741ac0e5commit | diff
Merge PR #27729 into master

* 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>
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.