From 7138386e7ba64247f3b95b6f20e0a7f33df5c05e Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Tue, 28 Sep 2021 15:16:23 -0500 Subject: [PATCH] Latest changelog update for 3004 --- CHANGELOG.md | 4 +++- changelog/60966.fixed | 1 - doc/topics/releases/3004.rst | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 changelog/60966.fixed diff --git a/CHANGELOG.md b/CHANGELOG.md index adc79e2c3201..8a591b6f0549 100644 --- 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 deleted file mode 100644 index 99f011a25287..000000000000 --- a/changelog/60966.fixed +++ /dev/null @@ -1 +0,0 @@ -Redirect imports of ``salt.ext.six`` to ``six`` diff --git a/doc/topics/releases/3004.rst b/doc/topics/releases/3004.rst index 23a940eeec69..f311a35f307d 100644 --- 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)