]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec12f6f d3db045)
Merge pull request #36405 from tchaikov/wip-heartbeat-atomic
authorKefu Chai <kchai@redhat.com>
Tue, 4 Aug 2020 13:27:31 +0000 (21:27 +0800)
committerGitHub <noreply@github.com>
Tue, 4 Aug 2020 13:27:31 +0000 (21:27 +0800)
common/HeartbeatMap: use std::atomic<time_point> for timeout

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.