Skip to content

Commit 6051f57

Browse files
authored
Merge branch 'develop' into develop
2 parents 77300d1 + 2d1a89b commit 6051f57

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

AUTHORS.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Emiel Kollof ekollof
6868
Eric Radman eradman [email protected]
6969
Erik Ankrom erikankrom
7070
Erik Johnson terminalmage [email protected]
71+
Erwin Dondorp erwindon [email protected]
7172
EYJ eyj
7273
Felippe Burk felippeb
7374
fizmat fizmat
@@ -170,7 +171,7 @@ Sam sticky-note [email protected]
170171
Sebastian Wendel sourceindex
171172
Sebastien Blaisot sblaisot
172173
Sergey Paramonov serge-p [email protected]
173-
Shane Lee twangboy slee@saltstack.com
174+
Shane Lee twangboy shane.lee@broadcom.com
174175
Shawn Butts shawnbutts
175176
Skyler Berg skylerberg [email protected]
176177
Stanislav B stanislavb

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v2025.09.03
2+
3+
## What's Changed
4+
5+
- Fixed installation on Photon 4 and Photon 5 by @erwindon in https://github.com/saltstack/salt-bootstrap/pull/2080
6+
- Properly handle 2 digit minor versions of Salt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2081
7+
18
# v2025.02.24
29

310
## What's Changed

0 commit comments

Comments
 (0)