]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b17398a 1a0e2f7)
Merge PR #24796 into nautilus 24787/head
authorSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 02:25:55 +0000 (21:25 -0500)
committerSage Weil <sage@redhat.com>
Mon, 29 Oct 2018 02:25:55 +0000 (21:25 -0500)
* refs/pull/24796/head:
osd: fix heartbeat_reset unlock

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.