Merge pull request #53949 from Matan-B/wip-51916-reef

author Matan Breizman <mbreizma@redhat.com>

Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)

committer GitHub <noreply@github.com>

Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)
author Matan Breizman <mbreizma@redhat.com>
Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)
committer GitHub <noreply@github.com>
Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)
diff --cc src/crimson/osd/heartbeat.cc
Simple merge
diff --cc src/crimson/osd/heartbeat.h
Simple merge
author	Matan Breizman <mbreizma@redhat.com>
	Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)
committer	GitHub <noreply@github.com>
	Tue, 17 Oct 2023 13:04:05 +0000 (16:04 +0300)
		1	2
src/crimson/osd/heartbeat.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crimson/osd/heartbeat.h	patch \|	diff1 \|	diff2 \|	blob \| history