Latest changelog update for 3004

saltstack · Sep 28, 2021 · 7138386 · 7138386
1 parent 8da1ffb
commit 7138386
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,10 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
-Salt 3004 (2021-09-27)
+Salt 3004 (2021-09-28)
 ======================
 
+
 Removed
 -------
 
@@ -41,6 +42,7 @@ Changed
 Fixed
 -----
 
+- Redirect imports of ``salt.ext.six`` to ``six`` (#60966)
 - Surface strerror to user state instead of returning false (#20789)
 - Fixing _get_envs() to preserve the order of pillar_roots. _get_envs() returned pillar_roots in a non-deterministic order. (#24501)
 - Fixes salt-cloud `KeyError` that occurs when there exists any subnets with no tags when profiles use `subnetname` (#44330)

diff --git a/changelog/60966.fixed b/changelog/60966.fixed
diff --git a/doc/topics/releases/3004.rst b/doc/topics/releases/3004.rst
@@ -73,6 +73,7 @@ Changed
 Fixed
 =====
 
+- Redirect imports of ``salt.ext.six`` to ``six`` (#60966)
 - Surface strerror to user state instead of returning false (#20789)
 - Fixing _get_envs() to preserve the order of pillar_roots. _get_envs() returned pillar_roots in a non-deterministic order. (#24501)
 - Fixes salt-cloud ``KeyError`` that occurs when there exists any subnets with no tags when profiles use ``subnetname`` (#44330)