Skip to content

Commit 56bd82b

Browse files
dwozdwoz
authored
Merge pull request #68295 from dwoz/merge/3007.x/3006.x-25-08-28
Merge forward form 3006.x to 3007.x
2 parents 304fa0d + eaf75f3 commit 56bd82b

File tree

5 files changed

+234
-0
lines changed

5 files changed

+234
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ Versions are `MAJOR.PATCH`.
88
# Changelog
99

1010
## 3007.6 (2025-07-10)
11+
## 3006.15 (2025-08-28)
12+
13+
14+
### Changed
15+
16+
- cmdmod: invoke a shell only with cmd.shell or when using the shell parameter
17+
cmdmod: run PowerShell scripts via -File instead of -Command
18+
cmdmod: allow passing args as a list for cmd.script
19+
cmdmod: return an error when running a bad command with cmd.powershell [#68156](https://github.com/saltstack/salt/issues/68156)
1120

1221

1322
### Fixed
@@ -22,6 +31,45 @@ Versions are `MAJOR.PATCH`.
2231

2332

2433
## 3007.5 (2025-06-26)
34+
- Fixes issue with the `minion.restart` function not working with systemd. Will
35+
now detect if the system is using systemd or is a Windows system and use
36+
`service.restart` instead. [#46255](https://github.com/saltstack/salt/issues/46255)
37+
- Fixed max_depth not respected in file.directory state [#55306](https://github.com/saltstack/salt/issues/55306)
38+
- Updated CLI examples in docs to conform to bash syntax. Standardized
39+
documentation on Windows modules to Google Style Python Docstrings. [#63856](https://github.com/saltstack/salt/issues/63856)
40+
- Ensure the right HOME environment value is set during Pygit2 remote initialization. [#64121](https://github.com/saltstack/salt/issues/64121)
41+
- Ensure network connections are cleanly closed in ipc and tcp transports [#67076](https://github.com/saltstack/salt/issues/67076)
42+
- cmdmod: fix special character handling on Windows [#68096](https://github.com/saltstack/salt/issues/68096)
43+
- cmdmod: fix quotation handling with Windows and Powershell [#68118](https://github.com/saltstack/salt/issues/68118)
44+
- Fixed ssh_known_hosts.present failure when ssh host keys changed [#68132](https://github.com/saltstack/salt/issues/68132)
45+
- Revert 'ipc_write_timeout' change (3006.13) due to multiple reports of this change causing instability [#68151](https://github.com/saltstack/salt/issues/68151)
46+
- cmdmod: handle cases where the temp script is not removed with cmd.script [#68156](https://github.com/saltstack/salt/issues/68156)
47+
- Fixed MinionManager.stop() to allow processing of minion event bus when called, to allow jobs returns from `service.restart salt-minion no_block=True` to reach
48+
master. [#68183](https://github.com/saltstack/salt/issues/68183)
49+
- grains.disks: fix exception with incompatible output of Get-PhysicalDisk [#68184](https://github.com/saltstack/salt/issues/68184)
50+
- Log a useful error if the minion's key is overwritten with bad data; instead of a traceback. [#68190](https://github.com/saltstack/salt/issues/68190)
51+
- win_lgpo_reg only applies user settings to the registry.pol file. It no longer
52+
applies those same settings to the user registry. Those settings will be applied
53+
to all users the next time they log in. [#68191](https://github.com/saltstack/salt/issues/68191)
54+
- salt.crypt.AsyncAuth and salt.crypt.SAuth read the private key from the
55+
filesystem a single time. [#68195](https://github.com/saltstack/salt/issues/68195)
56+
- Modifies systemd_service.{restart,stop} to default to using no_block=True when the service being stopped or restarted is the salt-minion. [#68212](https://github.com/saltstack/salt/issues/68212)
57+
- Upgrade onedir relenv to 0.20.5:
58+
- Update gdbm from 1.25 to 1.26
59+
- Update libffi from 3.5.1 to 3.5.2
60+
- Update readline from 8.2.13 to 8.3
61+
- Update sqlite from 3.50.2 to 3.50.4
62+
- Update sqlite on windows from 3.40.1 to 0.35.4 (CVE-2025-6965) [#68291](https://github.com/saltstack/salt/issues/68291)
63+
64+
65+
### Added
66+
67+
- Added a new `force` option to pkg.install on Windows to force the installer
68+
to run even if the package is already installed [#68102](https://github.com/saltstack/salt/issues/68102)
69+
- Adds support for creating a scheduled job to restart the minion if the initial
70+
attempt at restarting it via `minion.restart` has failed. [#68225](https://github.com/saltstack/salt/issues/68225)
71+
72+
2573
## 3006.14 (2025-07-10)
2674

2775

‎doc/topics/releases/3006.15.md‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
(release-3006.15)=
2+
# Salt 3006.15 release notes
3+
4+
<!---
5+
Do not edit this file. This is auto generated.
6+
Edit the templates in doc/topics/releases/templates/
7+
for a given release.
8+
-->
9+
10+
11+
<!--
12+
Add release specific details below
13+
-->
14+
15+
<!--
16+
Do not edit the changelog below.
17+
This is auto generated.
18+
-->
19+
## Changelog
20+
21+
### Changed
22+
23+
- cmdmod: invoke a shell only with cmd.shell or when using the shell parameter
24+
cmdmod: run PowerShell scripts via -File instead of -Command
25+
cmdmod: allow passing args as a list for cmd.script
26+
cmdmod: return an error when running a bad command with cmd.powershell [#68156](https://github.com/saltstack/salt/issues/68156)
27+
28+
29+
### Fixed
30+
31+
- Fixes issue with the `minion.restart` function not working with systemd. Will
32+
now detect if the system is using systemd or is a Windows system and use
33+
`service.restart` instead. [#46255](https://github.com/saltstack/salt/issues/46255)
34+
- Fixed max_depth not respected in file.directory state [#55306](https://github.com/saltstack/salt/issues/55306)
35+
- Updated CLI examples in docs to conform to bash syntax. Standardized
36+
documentation on Windows modules to Google Style Python Docstrings. [#63856](https://github.com/saltstack/salt/issues/63856)
37+
- Ensure the right HOME environment value is set during Pygit2 remote initialization. [#64121](https://github.com/saltstack/salt/issues/64121)
38+
- Ensure network connections are cleanly closed in ipc and tcp transports [#67076](https://github.com/saltstack/salt/issues/67076)
39+
- cmdmod: fix special character handling on Windows [#68096](https://github.com/saltstack/salt/issues/68096)
40+
- cmdmod: fix quotation handling with Windows and Powershell [#68118](https://github.com/saltstack/salt/issues/68118)
41+
- Fixed ssh_known_hosts.present failure when ssh host keys changed [#68132](https://github.com/saltstack/salt/issues/68132)
42+
- Revert 'ipc_write_timeout' change (3006.13) due to multiple reports of this change causing instability [#68151](https://github.com/saltstack/salt/issues/68151)
43+
- cmdmod: handle cases where the temp script is not removed with cmd.script [#68156](https://github.com/saltstack/salt/issues/68156)
44+
- Fixed MinionManager.stop() to allow processing of minion event bus when called, to allow jobs returns from `service.restart salt-minion no_block=True` to reach
45+
master. [#68183](https://github.com/saltstack/salt/issues/68183)
46+
- grains.disks: fix exception with incompatible output of Get-PhysicalDisk [#68184](https://github.com/saltstack/salt/issues/68184)
47+
- Log a useful error if the minion's key is overwritten with bad data; instead of a traceback. [#68190](https://github.com/saltstack/salt/issues/68190)
48+
- win_lgpo_reg only applies user settings to the registry.pol file. It no longer
49+
applies those same settings to the user registry. Those settings will be applied
50+
to all users the next time they log in. [#68191](https://github.com/saltstack/salt/issues/68191)
51+
- salt.crypt.AsyncAuth and salt.crypt.SAuth read the private key from the
52+
filesystem a single time. [#68195](https://github.com/saltstack/salt/issues/68195)
53+
- Modifies systemd_service.{restart,stop} to default to using no_block=True when the service being stopped or restarted is the salt-minion. [#68212](https://github.com/saltstack/salt/issues/68212)
54+
- Upgrade onedir relenv to 0.20.5:
55+
- Update gdbm from 1.25 to 1.26
56+
- Update libffi from 3.5.1 to 3.5.2
57+
- Update readline from 8.2.13 to 8.3
58+
- Update sqlite from 3.50.2 to 3.50.4
59+
- Update sqlite on windows from 3.40.1 to 0.35.4 (CVE-2025-6965) [#68291](https://github.com/saltstack/salt/issues/68291)
60+
61+
62+
### Added
63+
64+
- Added a new `force` option to pkg.install on Windows to force the installer
65+
to run even if the package is already installed [#68102](https://github.com/saltstack/salt/issues/68102)
66+
- Adds support for creating a scheduled job to restart the minion if the initial
67+
attempt at restarting it via `minion.restart` has failed. [#68225](https://github.com/saltstack/salt/issues/68225)

‎doc/topics/releases/templates/3006.15.md.template‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
(release-3006.15)=
2+
# Salt 3006.15 release notes{{ unreleased }}
3+
{{ warning }}
4+
5+
<!--
6+
Add release specific details below
7+
-->
8+
9+
<!--
10+
Do not edit the changelog below.
11+
This is auto generated.
12+
-->
13+
## Changelog
14+
{{ changelog }}

‎pkg/debian/changelog‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,58 @@ salt (3007.6) stable; urgency=medium
1414

1515
-- Salt Project Packaging <[email protected]> Thu, 10 Jul 2025 17:33:27 +0000
1616

17+
salt (3006.15) stable; urgency=medium
18+
19+
20+
# Changed
21+
22+
* cmdmod: invoke a shell only with cmd.shell or when using the shell parameter
23+
cmdmod: run PowerShell scripts via *File instead of -Command
24+
cmdmod: allow passing args as a list for cmd.script
25+
cmdmod: return an error when running a bad command with cmd.powershell [#68156](https://github.com/saltstack/salt/issues/68156)
26+
27+
# Fixed
28+
29+
* Fixes issue with the `minion.restart` function not working with systemd. Will
30+
now detect if the system is using systemd or is a Windows system and use
31+
`service.restart` instead. [#46255](https://github.com/saltstack/salt/issues/46255)
32+
* Fixed max_depth not respected in file.directory state [#55306](https://github.com/saltstack/salt/issues/55306)
33+
* Updated CLI examples in docs to conform to bash syntax. Standardized
34+
documentation on Windows modules to Google Style Python Docstrings. [#63856](https://github.com/saltstack/salt/issues/63856)
35+
* Ensure the right HOME environment value is set during Pygit2 remote initialization. [#64121](https://github.com/saltstack/salt/issues/64121)
36+
* Ensure network connections are cleanly closed in ipc and tcp transports [#67076](https://github.com/saltstack/salt/issues/67076)
37+
* cmdmod: fix special character handling on Windows [#68096](https://github.com/saltstack/salt/issues/68096)
38+
* cmdmod: fix quotation handling with Windows and Powershell [#68118](https://github.com/saltstack/salt/issues/68118)
39+
* Fixed ssh_known_hosts.present failure when ssh host keys changed [#68132](https://github.com/saltstack/salt/issues/68132)
40+
* Revert 'ipc_write_timeout' change (3006.13) due to multiple reports of this change causing instability [#68151](https://github.com/saltstack/salt/issues/68151)
41+
* cmdmod: handle cases where the temp script is not removed with cmd.script [#68156](https://github.com/saltstack/salt/issues/68156)
42+
* Fixed MinionManager.stop() to allow processing of minion event bus when called, to allow jobs returns from `service.restart salt-minion no_block=True` to reach
43+
master. [#68183](https://github.com/saltstack/salt/issues/68183)
44+
* grains.disks: fix exception with incompatible output of Get-PhysicalDisk [#68184](https://github.com/saltstack/salt/issues/68184)
45+
* Log a useful error if the minion's key is overwritten with bad data; instead of a traceback. [#68190](https://github.com/saltstack/salt/issues/68190)
46+
* win_lgpo_reg only applies user settings to the registry.pol file. It no longer
47+
applies those same settings to the user registry. Those settings will be applied
48+
to all users the next time they log in. [#68191](https://github.com/saltstack/salt/issues/68191)
49+
* salt.crypt.AsyncAuth and salt.crypt.SAuth read the private key from the
50+
filesystem a single time. [#68195](https://github.com/saltstack/salt/issues/68195)
51+
* Modifies systemd_service.{restart,stop} to default to using no_block=True when the service being stopped or restarted is the salt-minion. [#68212](https://github.com/saltstack/salt/issues/68212)
52+
* Upgrade onedir relenv to 0.20.5:
53+
* Update gdbm from 1.25 to 1.26
54+
* Update libffi from 3.5.1 to 3.5.2
55+
* Update readline from 8.2.13 to 8.3
56+
* Update sqlite from 3.50.2 to 3.50.4
57+
* Update sqlite on windows from 3.40.1 to 0.35.4 (CVE-2025-6965) [#68291](https://github.com/saltstack/salt/issues/68291)
58+
59+
# Added
60+
61+
* Added a new `force` option to pkg.install on Windows to force the installer
62+
to run even if the package is already installed [#68102](https://github.com/saltstack/salt/issues/68102)
63+
* Adds support for creating a scheduled job to restart the minion if the initial
64+
attempt at restarting it via `minion.restart` has failed. [#68225](https://github.com/saltstack/salt/issues/68225)
65+
66+
67+
-- Salt Project Packaging <[email protected]> Thu, 28 Aug 2025 01:02:37 +0000
68+
1769
salt (3006.14) stable; urgency=medium
1870

1971

‎pkg/rpm/salt.spec‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@
4040
%define fish_dir %{_datadir}/fish/vendor_functions.d
4141

4242
Name: salt
43+
<<<<<<< HEAD
4344
Version: 3007.6
45+
=======
46+
Version: 3006.15
47+
>>>>>>> 3006.x
4448
Release: 0
4549
Summary: A parallel remote execution system
4650
Group: System Environment/Daemons
@@ -757,6 +761,55 @@ fi
757761
- * Added support for `icmpv6-type` to salt.modules.nftables [#67882](https://github.com/saltstack/salt/issues/67882)
758762

759763

764+
* Thu Aug 28 2025 Salt Project Packaging <[email protected]> - 3006.15
765+
766+
# Changed
767+
768+
- cmdmod: invoke a shell only with cmd.shell or when using the shell parameter
769+
cmdmod: run PowerShell scripts via -File instead of -Command
770+
cmdmod: allow passing args as a list for cmd.script
771+
cmdmod: return an error when running a bad command with cmd.powershell [#68156](https://github.com/saltstack/salt/issues/68156)
772+
773+
# Fixed
774+
775+
- Fixes issue with the `minion.restart` function not working with systemd. Will
776+
now detect if the system is using systemd or is a Windows system and use
777+
`service.restart` instead. [#46255](https://github.com/saltstack/salt/issues/46255)
778+
- Fixed max_depth not respected in file.directory state [#55306](https://github.com/saltstack/salt/issues/55306)
779+
- Updated CLI examples in docs to conform to bash syntax. Standardized
780+
documentation on Windows modules to Google Style Python Docstrings. [#63856](https://github.com/saltstack/salt/issues/63856)
781+
- Ensure the right HOME environment value is set during Pygit2 remote initialization. [#64121](https://github.com/saltstack/salt/issues/64121)
782+
- Ensure network connections are cleanly closed in ipc and tcp transports [#67076](https://github.com/saltstack/salt/issues/67076)
783+
- cmdmod: fix special character handling on Windows [#68096](https://github.com/saltstack/salt/issues/68096)
784+
- cmdmod: fix quotation handling with Windows and Powershell [#68118](https://github.com/saltstack/salt/issues/68118)
785+
- Fixed ssh_known_hosts.present failure when ssh host keys changed [#68132](https://github.com/saltstack/salt/issues/68132)
786+
- Revert 'ipc_write_timeout' change (3006.13) due to multiple reports of this change causing instability [#68151](https://github.com/saltstack/salt/issues/68151)
787+
- cmdmod: handle cases where the temp script is not removed with cmd.script [#68156](https://github.com/saltstack/salt/issues/68156)
788+
- Fixed MinionManager.stop() to allow processing of minion event bus when called, to allow jobs returns from `service.restart salt-minion no_block=True` to reach
789+
master. [#68183](https://github.com/saltstack/salt/issues/68183)
790+
- grains.disks: fix exception with incompatible output of Get-PhysicalDisk [#68184](https://github.com/saltstack/salt/issues/68184)
791+
- Log a useful error if the minion's key is overwritten with bad data; instead of a traceback. [#68190](https://github.com/saltstack/salt/issues/68190)
792+
- win_lgpo_reg only applies user settings to the registry.pol file. It no longer
793+
applies those same settings to the user registry. Those settings will be applied
794+
to all users the next time they log in. [#68191](https://github.com/saltstack/salt/issues/68191)
795+
- salt.crypt.AsyncAuth and salt.crypt.SAuth read the private key from the
796+
filesystem a single time. [#68195](https://github.com/saltstack/salt/issues/68195)
797+
- Modifies systemd_service.{restart,stop} to default to using no_block=True when the service being stopped or restarted is the salt-minion. [#68212](https://github.com/saltstack/salt/issues/68212)
798+
- Upgrade onedir relenv to 0.20.5:
799+
- Update gdbm from 1.25 to 1.26
800+
- Update libffi from 3.5.1 to 3.5.2
801+
- Update readline from 8.2.13 to 8.3
802+
- Update sqlite from 3.50.2 to 3.50.4
803+
- Update sqlite on windows from 3.40.1 to 0.35.4 (CVE-2025-6965) [#68291](https://github.com/saltstack/salt/issues/68291)
804+
805+
# Added
806+
807+
- Added a new `force` option to pkg.install on Windows to force the installer
808+
to run even if the package is already installed [#68102](https://github.com/saltstack/salt/issues/68102)
809+
- Adds support for creating a scheduled job to restart the minion if the initial
810+
attempt at restarting it via `minion.restart` has failed. [#68225](https://github.com/saltstack/salt/issues/68225)
811+
812+
760813
* Thu Jul 10 2025 Salt Project Packaging <[email protected]> - 3006.14
761814

762815
# Fixed

0 commit comments

Comments
 (0)