Merge pull request #68084 from tchaikov/osd-odr

author Kefu Chai <k.chai@proxmox.com>

Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)

committer GitHub <noreply@github.com>

Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)
author Kefu Chai <k.chai@proxmox.com>
Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)
committer GitHub <noreply@github.com>
Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)
diff --cc src/osd/SnapMapper.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <k.chai@proxmox.com>
	Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)
committer	GitHub <noreply@github.com>
	Tue, 12 May 2026 09:28:13 +0000 (17:28 +0800)
		1	2
src/osd/SnapMapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history