8000 Backport #10664 and #11546 to r344 by charleskorn · Pull Request #11547 · grafana/mimir · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Backport #10664 and #11546 to r344 #11547

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

Merged
merged 2 commits into from
May 27, 2025
Merged

Backport #10664 and #11546 to r344 #11547

merged 2 commits into from
May 27, 2025

Conversation

charleskorn
Copy link
Contributor
@charleskorn charleskorn commented May 27, 2025

What this PR does

This is a manual backport for #11546 to r344 after the automated backport failed.

It also includes the changes from #10664, as separating just my changes from #11546 is too difficult, and r344 has only just been cut.

Which issue(s) this PR fixes or relates to

(none)

Checklist

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

…ainst GCS (#11546)

(cherry picked from commit d9e8a59)

# Conflicts:
#	go.sum
#	vendor/modules.txt
@charleskorn charleskorn marked this pull request as ready for review May 27, 2025 02:24
@charleskorn charleskorn requested review from stevesg and a team as code owners May 27, 2025 02:24
@charleskorn charleskorn enabled auto-merge (squash) May 27, 2025 02:24
@charleskorn charleskorn changed the title Backport #11546 to r344 Backport #10664 and #11546 to r344 May 27, 2025
…in) (#10664)

* Update github.com/thanos-io/objstore digest to a0136a6

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
@charleskorn charleskorn merged commit 8f2c332 into r344 May 27, 2025
30 checks passed
@charleskorn charleskorn deleted the backport-11546-to-r344 branch May 27, 2025 02:53
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
0