merge release 1.20.1 to master

Signed-off-by: SungJin1212 <[email protected]>

Author: SungJin1212

.github/workflows/test-build-deploy.yml

@@ -242,9 +242,9 @@ jobs:
             docker pull quay.io/cortexproject/cortex:v1.17.2
             docker pull quay.io/cortexproject/cortex:v1.18.1
             docker pull quay.io/cortexproject/cortex:v1.19.1
-            docker pull quay.io/cortexproject/cortex:v1.20.0
+            docker pull quay.io/cortexproject/cortex:v1.20.1
           elif [ "$TEST_TAGS" = "integration_query_fuzz" ]; then
-            docker pull quay.io/cortexproject/cortex:v1.20.0 
+            docker pull quay.io/cortexproject/cortex:v1.20.1
             docker pull quay.io/prometheus/prometheus:v3.6.0
           fi
           docker pull memcached:1.6.1

CHANGELOG.md

@@ -1,8 +1,6 @@
 # Changelog
 
-## 1.20.1 2025-12-03
-
-* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116
+## master / unreleased
 
 * [FEATURE] StoreGateway: Introduces a new parquet mode. #7046
 * [ENHANCEMENT] Alertmanager: Upgrade alertmanger to 0.29.0 and add a new incidentIO integration. #7092
@@ -16,9 +14,12 @@
 * [ENHANCEMENT] Distributor: Optimize memory usage by recycling v2 requests. #7131
 * [BUGFIX] Ring: Change DynamoDB KV to retry indefinitely for WatchKey. #7088
 * [BUGFIX] Ruler: Add XFunctions validation support. #7111
-* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116
 * [BUGFIX] Querier: propagate Prometheus info annotations in protobuf responses. #7132
 
+## 1.20.1 2025-12-03
+
+* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116
+
 ## 1.20.0 2025-11-10
 
 * [CHANGE] StoreGateway/Alertmanager: Add default 5s connection timeout on client. #6603

integration/backward_compatibility_test.go

@@ -36,7 +36,7 @@ var (
 		"quay.io/cortexproject/cortex:v1.17.2": nil,
 		"quay.io/cortexproject/cortex:v1.18.1": nil,
 		"quay.io/cortexproject/cortex:v1.19.1": nil,
-		"quay.io/cortexproject/cortex:v1.20.0": nil,
+		"quay.io/cortexproject/cortex:v1.20.1": nil,
 	}
 )