]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #24796 into nautilus
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)
commitbc7cfe0885d905c6fd4a7fad8640c93f4e929afa
treede35c2ac36cf312b1c78323d680b037c54c6dd53
parentb17398aea8772f1e874d2e99835a96367848afa9
parent1a0e2f7e1518d57bc07176f4297315a7c9a3c139
Merge PR #24796 into nautilus

* refs/pull/24796/head:
osd: fix heartbeat_reset unlock

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