Merge branch merge-mimir-distributed-release-5.2-to-main to main.

grafana · Mar 15, 2024 · 79c6155 · 79c6155
2 parents f377ac3 + f49a0b1
commit 79c6155
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/docs/sources/helm-charts/mimir-distributed/release-notes/v5.2.md b/docs/sources/helm-charts/mimir-distributed/release-notes/v5.2.md
@@ -32,3 +32,7 @@ Notable enhancements are as follows:
 ### 5.2.2
 
 - [PR 7555](https://github.com/grafana/mimir/pull/7555): Update GEM to v2.11.2
+
+### 5.2.3
+
+- [PR 7632](https://github.com/grafana/mimir/pull/7632): Fix crashloop in GEM admin-cache container
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -61,6 +61,9 @@ Entries should include a reference to the Pull Request that introduced the chang
 * [BUGFIX] Metamonitoring: update dashboards to drop unsupported `step` parameter in targets. #7157
 * [BUGFIX] Recording rules: drop rules for metrics removed in 2.0: `cortex_memcache_request_duration_seconds` and `cortex_cache_request_duration_seconds`. #7514
 * [BUGFIX] Store-gateway: setting "resources.requests.memory" with a quantity that used power-of-ten SI suffix, caused an error. #7506
+
+## 5.2.3
+
 * [BUGFIX] admin-cache: set max connections to fix failure to start #7632
 
 ## 5.2.2