Pedro Algarvio f389c29473 Merge 3006.x into master ... Conflicts: * requirements/darwin.txt * requirements/pytest.txt * requirements/static/ci/common.in * requirements/static/ci/darwin.in * requirements/static/ci/freebsd.in * requirements/static/ci/linux.in * requirements/static/ci/py3.10/cloud.txt * requirements/static/ci/py3.10/darwin.txt * requirements/static/ci/py3.10/freebsd.txt * requirements/static/ci/py3.10/lint.txt * requirements/static/ci/py3.10/linux.txt * requirements/static/ci/py3.10/windows.txt * requirements/static/ci/py3.11/windows.txt * requirements/static/ci/py3.7/cloud.txt * requirements/static/ci/py3.7/freebsd.txt * requirements/static/ci/py3.7/lint.txt * requirements/static/ci/py3.7/linux.txt * requirements/static/ci/py3.8/cloud.txt * requirements/static/ci/py3.8/freebsd.txt * requirements/static/ci/py3.8/lint.txt * requirements/static/ci/py3.8/linux.txt * requirements/static/ci/py3.8/windows.txt * requirements/static/ci/py3.9/cloud.txt * requirements/static/ci/py3.9/darwin.txt * requirements/static/ci/py3.9/freebsd.txt * requirements/static/ci/py3.9/lint.txt * requirements/static/ci/py3.9/linux.txt * requirements/static/ci/py3.9/windows.txt * requirements/static/pkg/freebsd.in * requirements/static/pkg/linux.in * requirements/static/pkg/py3.10/darwin.txt * requirements/static/pkg/py3.10/windows.txt * requirements/static/pkg/py3.11/windows.txt * requirements/static/pkg/py3.8/windows.txt * requirements/static/pkg/py3.9/darwin.txt * requirements/static/pkg/py3.9/windows.txt * requirements/windows.txt		2023-09-13 16:09:29 +01:00
..
integration	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
kitchen	Initial removal usage of distutils and replacement with setuptools	2022-12-20 07:07:21 -07:00
pkg/rpm
pytests	Merge 3006.x into master	2023-09-13 16:09:29 +01:00
support	Run pyupgrade on the files changed on the merge forward	2023-09-12 13:03:27 +01:00
unit	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
__init__.py	Make sys.path cleanup work on windows	2023-08-02 17:40:00 +00:00
buildpackage.py	Initial removal usage of distutils and replacement with setuptools	2022-12-20 07:07:21 -07:00
committer_parser.py
conftest.py	Define salt_factories_default_root_dir to try and avoid SELinux error on Fedora 38	2023-08-02 17:40:00 +00:00
eventlisten.py
eventlisten.sh
filename_map.yml	Move the service module and state integration tests to be functional tests	2023-07-20 15:16:09 +01:00
minionswarm.py
modparser.py
packdump.py
runtests.py
salt-tcpdump.py
saltsh.py
wheeltest.py
zypp_plugin.py