Merge upstream/main: resolve conflict with jaeger-mcp entry

Thomas Connally committed May 26, 2026 at 20:43 UTC acbbfaff1683419759c1d132d864a0b44ce4d96c

No changes.