Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3007.x] Merge forward 3006.x into 3007.x #66930

Open
wants to merge 10 commits into
base: 3007.x
Choose a base branch
from
Open

[3007.x] Merge forward 3006.x into 3007.x #66930

wants to merge 10 commits into from
+124 −243

Commits on Sep 23, 2024

  1. Removed notifying Slack since Slack no longer used.

    @dmurphy18 @dwoz
    dmurphy18 authored and dwoz committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    be33bf6 View commit details
    Browse the repository at this point in the history

  2. Upgrade relenv to 0.17.2

    @dwoz
    dwoz committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d11775e View commit details
    Browse the repository at this point in the history

  3. Fix error in test suite teardown 

    The error seen was:

Exception ignored in atexit callback: <bound method DeferredStreamHandler.flush of <DeferredStreamHandler <_io.FileIO [closed]> (WARNING)>>
Traceback (most recent call last):
  File "/home/dan/src/salt/salt/_logging/handlers.py", line 68, in flush
    super().flush()
  File "/usr/local/lib/python3.10/logging/__init__.py", line 1084, in flush
    self.stream.flush()
ValueError: I/O operation on closed file.
    @dwoz
    dwoz committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    64690a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Attempt to resolve test artifact flakiness 

    Adding a sleep between merging and downloading artifacts on windows.
    @dwoz
    dwoz committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f5c332b View commit details
    Browse the repository at this point in the history

  2. Revert "Attempt to resolve test artifact flakiness" 

    This reverts commit f5c332b.
    @dwoz
    dwoz committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8db71dd View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Better handling output of systemctl --version

    @vzhestkov @dwoz
    vzhestkov authored and dwoz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    47e412c View commit details
    Browse the repository at this point in the history

  2. Add more cases to test grains.core._systemd

    @vzhestkov @dwoz
    vzhestkov authored and dwoz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6976c17 View commit details
    Browse the repository at this point in the history

  3. Add 66856 changelog entry

    @vzhestkov @dwoz
    vzhestkov authored and dwoz committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    ee4d532 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/3006.x

    @dwoz
    dwoz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    19dfa41 View commit details
    Browse the repository at this point in the history

  2. Fix merge wart

    @dwoz
    dwoz committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ff12c7f View commit details
    Browse the repository at this point in the history