Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendor in Promtheus PR 14874 from mimir-promtheus at 78e8657d15de #9238

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

krajorama
Copy link
Contributor

Fix panic in chunk querier with OOO.

grafana/mimir-prometheus@78e8657 is on main.

Fix panic in chunk querier with OOO.

78e8657d15de is main mimir-prometheus

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama enabled auto-merge (squash) September 9, 2024 12:11
@krajorama krajorama merged commit 2142280 into main Sep 9, 2024
29 checks passed
@krajorama krajorama deleted the pick-prom-pr14874 branch September 9, 2024 12:35
grafanabot pushed a commit that referenced this pull request Sep 9, 2024
)

Fix panic in chunk querier with OOO.

78e8657d15de is main mimir-prometheus

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit 2142280)
krajorama added a commit that referenced this pull request Sep 9, 2024
) (#9241)

Fix panic in chunk querier with OOO.

78e8657d15de is main mimir-prometheus

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit 2142280)

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants