Update develop branch for the v2026.05.20 release

saltbot-open · saltbot-open · commit 4ff80d8c6332 · 2026-05-20T23:10:11.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v2026.05.20
+
+## What's Changed
+
+- Update urllib3 to 2.7.0 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2110
+- Update idna to >= 3.15 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2111
+- fix(bootstrap): install git deps from linux.lock or linux.txt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2112
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2026.05.01...v2026.05.20
+
 # v2026.05.01
 
 ## What's Changed
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
@@ -112,7 +112,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2026.05.01"
+$__ScriptVersion = "2026.05.20"
 $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="2026.05.01"
+__ScriptVersion="2026.05.20"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ if ($help) {`
`112`	`112`	`exit 0`
`113`	`113`	`}`
`114`	`114`
`115`		`-$__ScriptVersion = "2026.05.01"`
	`115`	`+$__ScriptVersion = "2026.05.20"`
`116`	`116`	`$ScriptName = $myInvocation.MyCommand.Name`
`117`	`117`
`118`	`118`	`# We'll check for the Version next, because it also has no requirements`