Skip to content

Commit 3c9da11

Browse files
Merge branch merge-release-3.0-to-main to main.
2 parents a4115ff + 1eb45f5 commit 3c9da11

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Grafana Mimir
66

7+
* [BUGFIX] Compactor: Fix potential concurrent map writes. #13053
8+
79
### Mixin
810

911
### Jsonnet
@@ -130,7 +132,6 @@
130132
* [BUGFIX] Query-frontend: Fix issue where shardable expressions containing aggregations with a shardable parameter (eg. `sum(foo)` in `topk(scalar(sum(foo)), sum by (pod) (bar))`) would not have the parameter sharded. #12958
131133
* [BUGFIX] Ingester: Fix `max_inflight_push_requests` metric and internal counter not decremented under pressure, possibly causing the rejection of all push requests. #12975
132134
* [BUGFIX] Store-gateway: Fix not being able to scale down via the `POST /prepare-shutdown` endpoint unless there are some active tenants with sharded blocks to the store-gateway replica. #12972
133-
* [BUGFIX] Compactor: Fix potential concurrent map writes. #13053
134135
* [BUGFIX] MQE: Fix invalid source label name in `label_join` error message, so it refers to the source label rather than the destination label. #12185
135136
* [BUGFIX] Continuous test: Fix false positive in metadata assertion when duplicate metadata is present in ingest-storage record correctness test. #12891
136137

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.17.1
1+
3.0.0-rc.0

0 commit comments

Comments
 (0)