Merge develop into stable for v2024.11.29 release

saltstack · Nov 29, 2024 · 0bf5ed6 · 0bf5ed6
2 parents f8cac03 + ce687f4
commit 0bf5ed6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# v2024.11.29
+
+## What's Changed
+
+- Updated date to overcome issue with existing tag for 2024.11.27 by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2058
+- Fix date tag by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2059
+- Revert forcing git tag, other issues with check sums calculated, easiest solution is wait a day to release by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2060
+- Updated date by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2061
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.29
+
+# v2024.11.27
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.27
+
+# v2024.11.27
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.27...v2024.11.27
+
+# v2024.11.27
+
+## What's Changed
+
+- Testing git install methods by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2057
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.26...v2024.11.27
+
 # v2024.11.27
 
 ## What's Changed

diff --git a/README.rst b/README.rst
@@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2024.11.27: ``e972bd1ef01d09cd1d9294374ef974c9e3dd9a2aee37cf3859144585fd8bf1d0``
 - 2024.11.26: ``832c7a20b96e1df171d715323df9afff8a11aef42d15598c007f240bc89d723c``
 - 2024.11.21: ``ddf624c3a94d721da3f7629402a6c7ecc9dd96d13c1ead2a626314e97cee982a``
 - 2024.11.07: ``70a9783649e129985563d1a86cf28b8984499643e62ae1dc47dc008bd204fcbb``

diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2024.11.27"
+$__ScriptVersion = "2024.11.29"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2024.11.27"
+__ScriptVersion="2024.11.29"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"