Merge branch 'w/126.0/feature/merge-125.0.6-tag' into tmp/octopus/w/1…

…27.0/feature/merge-125.0.6-tag
scality · Oct 6, 2023 · 20971ba · 20971ba
2 parents cceb213 + ec2c24e
commit 20971ba
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -168,7 +168,9 @@
   following [Google's recommandations](https://cloud.google.com/kubernetes-engine/docs/concepts/plan-node-sizes#memory_and_cpu_reservations)
   (PR[#4134](https://github.com/scality/metalk8s/pull/4134))
 
-## Release 125.0.6 (In development)
+## Release 125.0.7 (in development)
+
+## Release 125.0.6
 
 ### Enhancements
 
@@ -184,6 +186,10 @@
   on the salt master based on the salt pillar
   (PR[4156](https://github.com/scality/metalk8s/pull/4156))
 
+- Fix bug that make upgrade fail due a ETCd backup mishandle.
+  A retry logic was added to mitigate this problem.
+  (PR[4168](https://github.com/scality/metalk8s/pull/4168))
+
 ## Release 125.0.5
 
 ### Additions