]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24780 into nautilus
authorSage Weil <sage@redhat.com>
Sun, 28 Oct 2018 14:41:01 +0000 (09:41 -0500)
committerSage Weil <sage@redhat.com>
Sun, 28 Oct 2018 14:41:01 +0000 (09:41 -0500)
commitb17398aea8772f1e874d2e99835a96367848afa9
treee2ad3ea84bfd5398f671c73261e1d4acac871868
parentf755bed3e438d2e7d5ed0df30b8d5bebf2d0cf5a
parent51d8e2457d73c709bfa4f706793696b3ce704ff9
Merge PR #24780 into nautilus

* refs/pull/24780/head:
osd: take heartbeat_lock before checking for session

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
src/osd/OSD.cc