Skip to content

Sync upstream Prometheus at 9cc4741#852

Merged
charleskorn merged 1 commit into
mainfrom
charleskorn/update-prometheus
Mar 21, 2025
Merged

Sync upstream Prometheus at 9cc4741#852
charleskorn merged 1 commit into
mainfrom
charleskorn/update-prometheus

Conversation

@charleskorn
Copy link
Copy Markdown
Contributor

@charleskorn charleskorn commented Mar 21, 2025

This restores #844, which was reverted in #847.

Diff: prometheus/prometheus@8356990...9cc4741

Behaviour changes

Bugfixes

Performance improvements

Refactoring and code cleanup

Test improvements

Dependency upgrades

Not relevant to Mimir (eg. UI changes, CI changes, documentation changes)

…upstream"

This reverts commit 17d6477, reversing
changes made to f260bb3.

# Conflicts:
#	CHANGELOG.md
#	tsdb/head_test.go
#	tsdb/head_wal.go
@charleskorn charleskorn marked this pull request as ready for review March 21, 2025 01:16
@charleskorn charleskorn merged commit fb19f5f into main Mar 21, 2025
@charleskorn charleskorn deleted the charleskorn/update-prometheus branch March 21, 2025 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants