Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saltstack/salt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: saltstack/salt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3006.x
Choose a head ref
  • 10 commits
  • 17 files changed
  • 3 contributors

Commits on Jul 29, 2025

  1. bad key logs useful message instead of traceback

    When the minion's key is overwritten with bad data, log a useful message
    instead of traceback. Handle the error in a consistant way accross
    salt.minion, salt.channel.client, and salt.crypt.
    dwoz committed Jul 29, 2025
    Configuration menu
    Copy the full SHA
    84a1d5e View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2025

  1. Add force option to win_pkg

    twangboy authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    11ca7d7 View commit details
    Browse the repository at this point in the history
  2. Fixed some docs issues

    twangboy authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    264a6ca View commit details
    Browse the repository at this point in the history
  3. Allow events to be processed in minion shutdown

    Allows event to be handled after the salt-minion service has received
    a SIGTERM. Previously once the signal handler was entered, the ioloop
    would no longer run. If there are events on the minion event bus that
    needs processing, they would not be handled.
    
    Moves the MinionManager stop() functionality to an async function and
    allows the ioloop to run and clear any waiting events and returns to
    masters.
    barneysowood authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    5c8df36 View commit details
    Browse the repository at this point in the history
  4. Add test for MinionManager stop/stop_async

    Adds test for calling MinionManager stop() to test new functionality to
    allow events to be processed as minion is stopping.
    
    Sets up a MinionManager instance with a running event bus, then calls
    the stop function and immeadiately sends a test message on the event bus
    and reads it back to check that works once the stop() function has been
    called.
    
    Then checks that the usual functions to destroy the minion etc have
    also been called.
    barneysowood authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    3ed3496 View commit details
    Browse the repository at this point in the history
  5. Add changelog

    barneysowood authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    97f143a View commit details
    Browse the repository at this point in the history
  6. Ignore pylint warning on self.io_loop.add_callback

    Ignores warning from pylint about self.io_loop.add_callback() not being
    callable - it clearly is as stop_async gets called.
    barneysowood authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    90dc057 View commit details
    Browse the repository at this point in the history
  7. Set up short sock_dir path in test

    Sets up the short sock_dir path in the test. Previously setting it in
    conftest.py was breaking another test because I'd done it as a Path,
    not a string, but I want to avoid changin behaviour of other tests, so
    setting it locally to the test.
    barneysowood authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    6d0af4b View commit details
    Browse the repository at this point in the history
  8. Don't write user registry with win_lgpo_reg

    twangboy authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    5bde4c7 View commit details
    Browse the repository at this point in the history
  9. Fix state tests and a few bugs

    twangboy authored and dwoz committed Jul 30, 2025
    Configuration menu
    Copy the full SHA
    a829b36 View commit details
    Browse the repository at this point in the history
Loading