Skip to content

Commit bd29f9f

Browse files
committed
Merge develop into stable for v2024.07.23 release
2 parents fa25b2e + 7d55680 commit bd29f9f

File tree

4 files changed

+116
-41
lines changed

4 files changed

+116
-41
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# v2024.07.23
2+
3+
## What's Changed
4+
5+
- Updated link for Supported Operating Systems and Repository supported by Salt by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2010
6+
- Cleanup use of the term 'Post Neon' given only support 3006 and up by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2011
7+
- Added support with -W for installing salt-api by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2013
8+
9+
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.18...v2024.07.23
10+
111
# v2024.07.18
212

313
## What's Changed

README.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
3737

3838
The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
3939

40+
- 2024.07.18: ``92a74e7ff8a9032a7713c2b3955991d66aaca08a4eb9494ce3dd66b5044f6bc3``
4041
- 2024.07.16: ``4f76d1549c71d696a605f97645d8633b6269c4d9ae54b1fbdfedca1dcf893e7a``
4142
- 2024.07.12: ``526f4a5383db308081a120e26988679238ca6add4bf7a82120cbe71d57ab826e``
4243
- 2024.04.03: ``450ba5cde4af8d6cb5c56c66791f87b918bcda70ccdfb10abf3cc294143c8073``
@@ -118,6 +119,7 @@ To view the latest options and descriptions for ``salt-bootstrap``, use ``-h`` a
118119
-L Also install salt-cloud and required python-libcloud package
119120
-M Also install salt-master
120121
-S Also install salt-syndic
122+
-W Also install salt-api
121123
-N Do not install salt-minion
122124
-X Do not start daemons after installation
123125
-d Disables checking if Salt services are enabled to start on system boot.
@@ -372,12 +374,15 @@ Supported Operating Systems
372374
---------------------------
373375

374376
The salt-bootstrap script officially supports the distributions outlined in
375-
`Salt's Supported Operating Systems`_ document, (BSD-based OSs, Solaris and AIX are no longer
377+
`Salt's Supported Operating Systems
378+
<https://docs.saltproject.io/salt/install-guide/en/latest/topics/salt-supported-operating-systems.html>`_
379+
document, (BSD-based OSs, Solaris and AIX are no longer
376380
supported). The operating systems listed below should reflect this document but may become out of
377381
date. If an operating system is listed below, but is not listed on the official supported operating
378382
systems document, the level of support is "best-effort".
379383

380-
Since Salt is written in Python, the packages available from the `Salt Project's repository`_ are
384+
Since Salt is written in Python, the packages available from the `Salt Project's repository
385+
<https://repo.saltproject.io/salt/py3>`_ are
381386
CPU architecture independent and could be installed on any hardware supported by Linux kernel.
382387
However, the Salt Project does package Salt's binary dependencies only for ``x86_64`` (``amd64``)
383388
and ``AArch64`` (``arm64``).

bootstrap-salt.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if ($help) {
110110
exit 0
111111
}
112112

113-
$__ScriptVersion = "2024.07.18"
113+
$__ScriptVersion = "2024.07.23"
114114
$ScriptName = $myInvocation.MyCommand.Name
115115

116116
# We'll check for the Version next, because it also has no requirements

0 commit comments

Comments
 (0)