This repository has been archived by the owner on Apr 28, 2022. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge freeze into master (saltstack#61310)
* Redirect imports of ``salt.ext.six`` to ``six`` Fixes saltstack#60966 * Latest changelog update for 3004 * Handle signals and properly exit, instead of raising exceptions. This was introduced in 26fcda5 Fixes saltstack#60391 Fixes saltstack#60963 * Add test for saltstack#61003 * Fix saltstack#61003 Restored the previously shifted check for version_to_remove in old[target]. This had been extracted along with the correctly extracted double pkg_params[target] lookup, but that lost the `target in old` guard. Putting the check back here prevents KeyError when looking for a non-existent target in `old`. * Handle various architecture formats in aptpkg module * Write file even if does not exist * only run test on debian based platforms * remove extra space for arch * convert pathlib to string for pkgrepo test * Use temporary files first then copy to sources files * fixes saltstack#59182 fix handling of duplicate keys in rest_cherrypy data * added changelog * remove log messages to prevent leaks of sensitive info * Reverting changes in PR saltstack#60150. Updating installed and removed functions to return changes when test=True. * Adding changelog. * Add a test and fix for extra-filerefs * Do not break master_tops for minion with version lower to 3003 * Add changelog file * Add extra comment to clarify discussion * Update changelog file * Add deprecated changelog * Assert that the command didn't finish Refs saltstack#60972 * Always restore signals, even when exceptions occur * Reset signal handlers before starting the process * Make sure that the `ProcessManager` doesn't always ignore signals * Provide valid default value for bootstrap_delay * Update changelog for 3004 * Update changelog and release notes for 3004 * Add PR 61020 to changelog * Update release notes index file and create 3005 file * Update docs * bad merge from master, redoing the PR for adding the Deltaproxy documentation. * Adding doc/ref/configuration/delta_proxy.rst. * cleaning up this paragraph, adding in network administrators in addition to system administrators. Co-authored-by: Pedro Algarvio <pedro@algarvio.me> Co-authored-by: ScriptAutomate <derek@icanteven.io> Co-authored-by: Wayne Werner <wwerner@vmware.com> Co-authored-by: Megan Wilhite <mwilhite@vmware.com> Co-authored-by: nicholasmhughes <nicholasmhughes@gmail.com> Co-authored-by: Daniel A. Wozniak <dwozniak@saltstack.com> Co-authored-by: Pablo Suárez Hernández <psuarezhernandez@suse.com> Co-authored-by: Alyssa Rock <arock@saltstack.com> Co-authored-by: Twangboy <shane.d.lee@gmail.com>
- Loading branch information