Jan-Otto Kröpke 638dc8dbdc Merge branch 'release-3.4' into release-3.4-main ... # Conflicts: # .github/workflows/ci.yml # CHANGELOG.md # RELEASE.md # VERSION # cmd/prometheus/main_test.go # docs/configuration/configuration.md # web/ui/mantine-ui/package.json # web/ui/module/codemirror-promql/package.json # web/ui/module/lezer-promql/package.json # web/ui/package-lock.json # web/ui/package.json		2025-05-31 12:48:16 +02:00
..
api/v1	Add primitive support for ingesting OTLP delta metrics as-is (#16360)	2025-04-23 09:58:02 -03:00
ui	Merge branch 'release-3.4' into release-3.4-main	2025-05-31 12:48:16 +02:00
federate.go	feature: type-and-unit-labels (PROM-39 implementation) (#16228)	2025-05-17 09:37:25 +00:00
federate_test.go	feature: type-and-unit-labels (PROM-39 implementation) (#16228)	2025-05-17 09:37:25 +00:00
web.go	Fix linting issues found by golangci-lint v2.0.2 (#16368)	2025-05-03 19:05:13 +02:00
web_test.go	Fix linting issues found by golangci-lint v2.0.2 (#16368)	2025-05-03 19:05:13 +02:00