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

Merge release v0.32.5 to main #6822

Merged
merged 2 commits into from Oct 19, 2023

Commits on Oct 19, 2023

  1. Cut patch release v0.32.5 (thanos-io#6820)

    * 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>
    8 people committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    750e8a9 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into merge-release-0.32.5-to-main

    Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
    saswatamcode committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    1e77599 View commit details
    Browse the repository at this point in the history