Merge release v0.32.5 to main
#6822
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Build with Go 1.21 (thanos-io#6615) * Build with Go 1.21 Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> * Update tools Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> --------- Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> * update go alpine image to 3.18 (thanos-io#6750) Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> * build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0. - [Commits](golang/net@v0.14.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updates busybox SHA (thanos-io#6808) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com> * Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817) * fix matchersToPostingGroups vals variable shadow bug Signed-off-by: Ben Ye <benye@amazon.com> * update changelog Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> * fix head series limiter trigger (thanos-io#6802) Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * Store: fix prometheus store label values for matches on external labels (thanos-io#6816) External Labels should also be tested for matches against the matchers. Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> * Cut patch release v0.32.5 Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> * Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)" This reverts commit 4ed9bb0. Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> --------- Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: GitHub <noreply@github.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com> Co-authored-by: Ben Ye <benye@amazon.com> Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
|
Oops, forgot that we shouldn't squash 🤦 oh well :/ |
coleenquadros
added a commit
to coleenquadros/thanos
that referenced
this pull request
Oct 19, 2023
* Build with Go 1.21 (thanos-io#6615) * Build with Go 1.21 * Update tools --------- * update go alpine image to 3.18 (thanos-io#6750) * build(deps): bump golang.org/x/net from 0.14.0 to 0.17.0 (thanos-io#6805) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.14.0 to 0.17.0. - [Commits](golang/net@v0.14.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... * Updates busybox SHA (thanos-io#6808) * Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817) * fix matchersToPostingGroups vals variable shadow bug * update changelog --------- * fix head series limiter trigger (thanos-io#6802) * Store: fix prometheus store label values for matches on external labels (thanos-io#6816) External Labels should also be tested for matches against the matchers. * Cut patch release v0.32.5 * Revert "Fix matchersToPostingGroups vals variable shadow bug (thanos-io#6817)" This reverts commit 4ed9bb0. --------- Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com> Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: GitHub <noreply@github.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> Co-authored-by: Coleen Iona Quadros <coleen.quadros27@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: fpetkovski <fpetkovski@users.noreply.github.com> Co-authored-by: Ben Ye <benye@amazon.com> Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Co-authored-by: Michael Hoffmann <mhoffm@posteo.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Verification