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
..
_logging	Add back code logic that pyupgrade removed.	2023-08-17 20:34:21 +01:00
acl
auth	Run with py3.10 and migrate tests	2023-08-08 14:47:15 -07:00
beacons	Run pyupgrade on the files changed on the merge forward	2023-09-12 13:03:27 +01:00
cache	Run pyupgrade of the modified files from the merge forward	2023-06-11 10:03:42 +01:00
channel	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
cli	More tests	2023-09-06 15:02:26 -07:00
client	Stop using the deprecated locale.getdefaultlocale() function	2023-06-29 08:01:12 +01:00
cloud	make Cloud::vm_config() handle per-VM vm_overrides according to inline docs	2023-08-25 13:12:47 +00:00
config	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
daemons	Run pyupgrade on the files changed on the merge forward	2023-09-12 13:03:27 +01:00
defaults
engines	Adding deprecate dunder to a couple additional modules.	2023-08-28 20:30:21 +00:00
executors	Adding deprecate dunder to a couple additional modules.	2023-08-28 20:30:21 +00:00
ext
fileserver
grains	Run pyupgrade on the files changed on the merge forward	2023-09-12 13:03:27 +01:00
loader	Fix Flaky LazyLoaderRefreshFileMappingTest	2023-08-25 13:12:09 +00:00
log	Disabling lint message	2023-07-28 18:24:59 +01:00
log_handlers
matchers
metaproxy	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
modules	Merge 3006.x into master	2023-09-13 16:09:29 +01:00
netapi	Merge 3006.x into master	2023-09-13 16:09:29 +01:00
output
pillar	Merge 3006.x into master	2023-08-06 08:13:52 +01:00
platform
proxy	Adding deprecate dunder to a couple additional modules.	2023-08-28 20:30:21 +00:00
queues
renderers	Merge 3006.x into master	2023-08-06 08:13:52 +01:00
returners	Adding deprecation decorator to zabbix modules for 3009.	2023-08-28 20:30:08 +00:00
roster
runners	Run pyupgrade on the files changed on the merge forward	2023-09-12 13:03:27 +01:00
sdb
serializers
spm
states	Merge 3006.x into master	2023-09-13 16:09:29 +01:00
templates
thorium
tokens
tops
transport	Salt no longer vendors tornado	2023-09-12 13:03:27 +01:00
utils	Merge 3006.x into master	2023-09-13 16:09:29 +01:00
wheel	Run pyupgrade against the files being merged forwarded	2023-06-16 07:32:35 +01:00
__init__.py	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
_compat.py
_pkg.txt	Move _pkg.txt into salt directory	2023-08-04 16:29:46 +01:00
crypt.py	Spawning platform fix	2023-09-06 15:02:26 -07:00
exceptions.py
features.py
fileclient.py	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
key.py	Add cluster config settings	2023-09-06 15:02:26 -07:00
master.py	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
minion.py	Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x	2023-09-08 16:25:39 -04:00
payload.py	Bump to salt-rewrite==2.5.2 and fix warn_until calls.	2023-06-19 07:21:24 +01:00
runner.py	Run pypugrade against the files changed in the merge-forward	2023-06-28 11:56:47 +01:00
scripts.py	Run pyupgrade on the files changed on the merge forward	2023-08-16 09:16:19 +01:00
state.py	Run pyupgrade on the files changed on the merge forward	2023-08-16 09:16:19 +01:00
syspaths.py
template.py
version.py	Add Salt package type to versions report and grain	2023-08-04 16:29:46 +01:00