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

Re-cut r315 #9825

Merged
merged 8 commits into from
Nov 4, 2024
Merged

Re-cut r315 #9825

merged 8 commits into from
Nov 4, 2024

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Nov 4, 2024

What this PR does

Re-cut r315 on latest main, so we get the down-grade to gRPC v1.65.0.

Which issue(s) this PR fixes or relates to

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

grafanabot and others added 8 commits October 15, 2024 11:49
… to f90c89a (main) (#9625)

* Update github.com/thanos-io/objstore digest to f90c89a (#9534)

Signed-off-by: Arve Knudsen <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 3c97a61)

* update changelog

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Vladimir Varankin <[email protected]>
* bump patch version

Signed-off-by: Vladimir Varankin <[email protected]>

* rebuild assets

Signed-off-by: Vladimir Varankin <[email protected]>

---------

Signed-off-by: Vladimir Varankin <[email protected]>
This would previously panic after the query was closed
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Revert "Don't free buffers after reading query stream (#9721)"

This reverts commit f7b6017.

* Revert: Upgrade to google.golang.org/grpc v1.66.2 / modify certain protobuf messages to retain their unmarshaling buffer (#9401)

Signed-off-by: Yuri Nikolic <[email protected]>

* Revert "Distributor.queryIngesterStream: Free gRPC buffers upon error (#9756)"

This reverts commit eda1a4b.

---------

Signed-off-by: Yuri Nikolic <[email protected]>
…B head compaction (cherry-pick Prometheus PR 15242) (#9822)

* Cherry-pick Prometheus PR 15242

Signed-off-by: Marco Pracucci <[email protected]>

* Added CHANGELOG entry

Signed-off-by: Marco Pracucci <[email protected]>

* Updated CHANGELOG

Signed-off-by: Marco Pracucci <[email protected]>

---------

Signed-off-by: Marco Pracucci <[email protected]>
@aknuds1 aknuds1 requested review from stevesg, grafanabot and a team as code owners November 4, 2024 10:31
@aknuds1 aknuds1 requested a review from ortuman November 4, 2024 10:31
@aknuds1 aknuds1 enabled auto-merge (squash) November 4, 2024 10:40
@aknuds1 aknuds1 merged commit ebd284e into r315 Nov 4, 2024
52 checks passed
@aknuds1 aknuds1 deleted the arve/re-cut-r315 branch November 4, 2024 10:43
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.

7 participants