Skip to content

Commit 5d98839

Browse files
authored
Merge pull request #7137 from SungJin1212/merge-release-1.20.1-to-master
Merge release 1.20.1 to master
2 parents dc6a29c + aae108a commit 5d98839

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ jobs:
242242
docker pull quay.io/cortexproject/cortex:v1.17.2
243243
docker pull quay.io/cortexproject/cortex:v1.18.1
244244
docker pull quay.io/cortexproject/cortex:v1.19.1
245-
docker pull quay.io/cortexproject/cortex:v1.20.0
245+
docker pull quay.io/cortexproject/cortex:v1.20.1
246246
elif [ "$TEST_TAGS" = "integration_query_fuzz" ]; then
247-
docker pull quay.io/cortexproject/cortex:v1.20.0
247+
docker pull quay.io/cortexproject/cortex:v1.20.1
248248
docker pull quay.io/prometheus/prometheus:v3.6.0
249249
fi
250250
docker pull memcached:1.6.1

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
* [ENHANCEMENT] Distributor: Optimize memory usage by recycling v2 requests. #7131
1616
* [BUGFIX] Ring: Change DynamoDB KV to retry indefinitely for WatchKey. #7088
1717
* [BUGFIX] Ruler: Add XFunctions validation support. #7111
18-
* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116
1918
* [BUGFIX] Querier: propagate Prometheus info annotations in protobuf responses. #7132
2019

20+
## 1.20.1 2025-12-03
21+
22+
* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116
23+
2124
## 1.20.0 2025-11-10
2225

2326
* [CHANGE] StoreGateway/Alertmanager: Add default 5s connection timeout on client. #6603

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.0
1+
1.20.1

docs/getting-started/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CORTEX_VERSION=v1.20.0
1+
CORTEX_VERSION=v1.20.1
22
GRAFANA_VERSION=10.4.2
33
PROMETHEUS_VERSION=v3.2.1
44
SEAWEEDFS_VERSION=3.67

integration/backward_compatibility_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
"quay.io/cortexproject/cortex:v1.17.2": nil,
3737
"quay.io/cortexproject/cortex:v1.18.1": nil,
3838
"quay.io/cortexproject/cortex:v1.19.1": nil,
39-
"quay.io/cortexproject/cortex:v1.20.0": nil,
39+
"quay.io/cortexproject/cortex:v1.20.1": nil,
4040
}
4141
)
4242

0 commit comments

Comments
 (0)