From db07164315a7c1dd384a59e2fd78cba67031f845 Mon Sep 17 00:00:00 2001
From: Salt Project Packaging <saltproject-packaging@vmware.com>
Date: Thu, 12 Dec 2024 20:16:55 +0000
Subject: [PATCH] Update develop branch for the v2024.12.12 release

---
 CHANGELOG.md       | 9 +++++++++
 bootstrap-salt.ps1 | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16e7ac943..7b87b2d2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v2024.12.12
+
+## What's Changed
+
+- Restrict use of dnf to Fedora only, otherwise use yum when dealing with RedHat family by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2070
+- Updating container usage to that used in new Salt pipelines for CI/CD, fix Amazon Linux by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2071
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.12.09...v2024.12.12
+
 # v2024.12.09
 
 ## What's Changed
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
index f355e0cd1..8b1bb3a38 100644
--- a/bootstrap-salt.ps1
+++ b/bootstrap-salt.ps1
@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2024.12.09"
+$__ScriptVersion = "2024.12.12"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements