Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cortexproject/cortex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.21.0-rc.0
Choose a base ref
...
head repository: cortexproject/cortex
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.21.0-rc.1
Choose a head ref
  • 4 commits
  • 21 files changed
  • 3 contributors

Commits on Mar 14, 2026

  1. Fix changelog entries for release (#7350)

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    friedrichg authored Mar 14, 2026
    Configuration menu
    Copy the full SHA
    754a70e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2026

  1. Backport bug fixes to release-1.21 (#7428)

    * Memberlist cas error code false positive (#7408)
    
    * use errors.As in getCasErrorCode to unwrap memberlist errors
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * fix test
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Fix nil when ingesterQueryMaxAttempts > 1 (#7369)
    
    * Trigger nil with test
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Fix nil results
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * fix changelog
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    ---------
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * fix: alertmanager user config disappearing when ring is unreachable  (#7372)
    
    * Fix multitenant alertmanager user config disappearing when ring is unreachable
    
    Signed-off-by: Kishore K G <[email protected]>
    
    * Add change log
    
    Signed-off-by: Kishore K G <[email protected]>
    
    * format multitenant
    
    Signed-off-by: Kishore K G <[email protected]>
    
    * fix pr number
    
    Signed-off-by: Kishore K G <[email protected]>
    
    * use ErrNotFound for error validation in unit test
    
    Signed-off-by: kishorekg1999 <[email protected]>
    
    ---------
    
    Signed-off-by: Kishore K G <[email protected]>
    Signed-off-by: kishorekg1999 <[email protected]>
    Signed-off-by: kishorekg1999 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Clean Symbol Tables (#7373)
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Fix root cause of nil return in queryWithRetry and labelsWithRetry (#7375)
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * fix regex resolver match 0 or 1 tenant bug (#7424)
    
    * fix regex resolver match 0 or 1 tenant bug
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * fix test
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * skip nil values in Memberlist WatchPrefix (#7429)
    
    * skip nil values in Memberlist WatchPrefix
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * fix lint
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Remove duplicate CHANGELOG entry for #7373
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Fix integration test flag name for release-1.21
    
    The cherry-pick of #7424 brought the master flag name
    -limits.query-ingesters-within, but release-1.21 still uses
    -querier.query-ingesters-within (renamed in #7160, master-only).
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    Signed-off-by: Kishore K G <[email protected]>
    Signed-off-by: kishorekg1999 <[email protected]>
    Signed-off-by: kishorekg1999 <[email protected]>
    Co-authored-by: SungJin1212 <[email protected]>
    Co-authored-by: kishorekg1999 <[email protected]>
    3 people authored Apr 17, 2026
    Configuration menu
    Copy the full SHA
    167b376 View commit details
    Browse the repository at this point in the history
  2. Backport to 1.21. Add local cache to regexResolver (#7436)

    * Add local cache to regexResolver (#7363)
    
    * Add local cache to regexResolver
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * Add cache hit/miss metrics
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * Refactor test
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * fix lint
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * update v1-guarantees
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    * annotation
    
    Signed-off-by: SungJin1212 <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    * Re-order changelog
    
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    
    ---------
    
    Signed-off-by: SungJin1212 <[email protected]>
    Signed-off-by: Friedrich Gonzalez <[email protected]>
    Co-authored-by: SungJin1212 <[email protected]>
    friedrichg and SungJin1212 authored Apr 17, 2026
    Configuration menu
    Copy the full SHA
    c09db14 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2026

  1. Prepare release candidate 1 for v1.21.0 (#7438)

    Signed-off-by: Friedrich Gonzalez <[email protected]>
    friedrichg authored Apr 18, 2026
    Configuration menu
    Copy the full SHA
    c06c392 View commit details
    Browse the repository at this point in the history
Loading