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

[master] Merge 3007.x into master #66520

Merged
merged 29 commits into from
May 16, 2024
Merged

[master] Merge 3007.x into master #66520

merged 29 commits into from
May 16, 2024

Commits on May 13, 2024

  1. Add Fedora 40 and Ubuntu 24.04 support

    @ScriptAutomate @s0undt3ch
    ScriptAutomate authored and s0undt3ch committed May 13, 2024
    Configuration menu
    Copy the full SHA
    457dfa6 View commit details
    Browse the repository at this point in the history

  2. Skip problematic tests due to system python being too recent

    @s0undt3ch
    s0undt3ch committed May 13, 2024
    Configuration menu
    Copy the full SHA
    85ea23d View commit details
    Browse the repository at this point in the history

  3. Fix(or skip) remaining broken tests for Ubuntu 24.04

    @s0undt3ch
    s0undt3ch committed May 13, 2024
    Configuration menu
    Copy the full SHA
    86245dc View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge 3006.x into 3007.x

    @s0undt3ch
    s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    3c5b143 View commit details
    Browse the repository at this point in the history

  2. Fix workflows.

    @s0undt3ch
    s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    6161ebc View commit details
    Browse the repository at this point in the history

  3. Add test for issue 66342 

    (cherry picked from commit 87bb87e)
    @lkubb @s0undt3ch
    lkubb authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    fe29d3c View commit details
    Browse the repository at this point in the history

  4. Don't unnecessarily download remote sources to cache 

    (cherry picked from commit 109dd48)
    @lkubb @s0undt3ch
    lkubb authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    e56ad17 View commit details
    Browse the repository at this point in the history

  5. Remove 3007+ only params in get_source_sum call

    @lkubb @s0undt3ch
    lkubb authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    7924241 View commit details
    Browse the repository at this point in the history

  6. Migrate to TZ-aware datetime objects in x509_v2

    @lkubb @s0undt3ch
    lkubb authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    37e50b0 View commit details
    Browse the repository at this point in the history

  7. Add regression test for issue 65837

    @lkubb @s0undt3ch
    lkubb authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    1ba5296 View commit details
    Browse the repository at this point in the history

  8. Fix saltstack#66382 (nftables): Produce correct ip family for rules w… 

    …ith saddr or daddr
    @jdelic @s0undt3ch
    jdelic authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    9e16ab4 View commit details
    Browse the repository at this point in the history

  9. fixes saltstack#65295 nftables module type does not ensure unique nft… 

    … family values

(cherry picked from commit ab72e70)
    @nicholasmhughes @s0undt3ch
    nicholasmhughes authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    b6dcf7e View commit details
    Browse the repository at this point in the history

  10. Add warning about effective rights mask 

    Group permission on the file should generally be at least as broad as
any file ACLs, to avoid ineffective ACLs and/or changes each time the
state is run.

(cherry picked from commit b897734)
    @dehnert @s0undt3ch
    dehnert authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    5028305 View commit details
    Browse the repository at this point in the history

  11. Special-case Ubuntu 24.04

    @s0undt3ch
    s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    790304d View commit details
    Browse the repository at this point in the history

  12. Increase timeouts on the formulas tests

    @s0undt3ch
    s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    979261d View commit details
    Browse the repository at this point in the history

  13. Use Powershell instead of netsh for firewall settings

    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    344a3d8 View commit details
    Browse the repository at this point in the history

  14. Remove __virtual__ and __hostname__

    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    974dacc View commit details
    Browse the repository at this point in the history

  15. Remove test for 57591 since N/A

    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    b6a9cc9 View commit details
    Browse the repository at this point in the history

  16. Temporary skip tests on PhotonOS 5

    @s0undt3ch
    s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    7762814 View commit details
    Browse the repository at this point in the history

  17. Fix issues with the cmd module on Windows 

    stderr is no longer piped to stdout by default for cmd.run
Scripts are called using the -File paramter for powershell.exe
stderr is cleared if it contains CLIXML (only for encoded commands)
cmd.powershell now accepts lists as commands
Makes sure returned JSON data is valid before trying to load it
Strips whitespace from the stdout in win_runas
    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    45c56b0 View commit details
    Browse the repository at this point in the history

  18. Make redirect_true default to True

    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    dccf230 View commit details
    Browse the repository at this point in the history

  19. Fix some tests

    @twangboy @s0undt3ch
    twangboy authored and s0undt3ch committed May 14, 2024
    Configuration menu
    Copy the full SHA
    580ad43 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge pull request saltstack#66515 from s0undt3ch/hotfix/merge-forwar… 

    …d-into-3007.x

[3007.x] Merge 3006.x into 3007.x
    @s0undt3ch
    s0undt3ch authored May 15, 2024
    Configuration menu
    Copy the full SHA
    e39e606 View commit details
    Browse the repository at this point in the history

  2. Merge 3006.x into 3007.x

    @s0undt3ch
    s0undt3ch committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0f2c3b5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#66521 from s0undt3ch/hotfix/merge-forwar… 

    …d-into-3007.x

[3007.x] Merge 3006.x into 3007.x
    @s0undt3ch
    s0undt3ch authored May 15, 2024
    Configuration menu
    Copy the full SHA
    70324fa View commit details
    Browse the repository at this point in the history

  4. Merge 3007.x into master

    @s0undt3ch
    s0undt3ch committed May 15, 2024
    Configuration menu
    Copy the full SHA
    06bd9d1 View commit details
    Browse the repository at this point in the history

  5. Remove try/except

    @twangboy
    twangboy committed May 15, 2024
    Configuration menu
    Copy the full SHA
    75126a7 View commit details
    Browse the repository at this point in the history

  6. There's no such thing as pytest.skipTest

    @s0undt3ch
    s0undt3ch committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f72dd14 View commit details
    Browse the repository at this point in the history

  7. Fix broken test on Ubuntu 24.04

    @s0undt3ch
    s0undt3ch committed May 15, 2024
    Configuration menu
    Copy the full SHA
    7835f3a View commit details
    Browse the repository at this point in the history