Merge branch 'master' into master_port_48609

saltstack · Jan 19, 2022 · 7ec58b1 · 7ec58b1
2 parents 962fc67 + eb8bd12
commit 7ec58b1
Show file tree

Hide file tree

Showing 5,753 changed files with 680,352 additions and 276,709 deletions.
diff --git a/.bandit b/.bandit
@@ -0,0 +1,3 @@
+[bandit]
+exclude: salt/ext/tornado/*,tests/minionswarm.py
+skip: B701
diff --git a/.ci/docs b/.ci/docs
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
diff --git a/.ci/kitchen-amazon2-py3-pytest b/.ci/kitchen-amazon2-py3-pytest
diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3
diff --git a/.ci/kitchen-archlts-py3-pytest b/.ci/kitchen-archlts-py3-pytest
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
diff --git a/.ci/kitchen-centos7-py3-cloud b/.ci/kitchen-centos7-py3-cloud
diff --git a/.ci/kitchen-centos7-py3-cloud-pytest b/.ci/kitchen-centos7-py3-cloud-pytest
diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto
diff --git a/.ci/kitchen-centos7-py3-m2crypto-pytest b/.ci/kitchen-centos7-py3-m2crypto-pytest
diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy
diff --git a/.ci/kitchen-centos7-py3-pycryptodome b/.ci/kitchen-centos7-py3-pycryptodome
diff --git a/.ci/kitchen-centos7-py3-pycryptodome-pytest b/.ci/kitchen-centos7-py3-pycryptodome-pytest
diff --git a/.ci/kitchen-centos7-py3-pytest b/.ci/kitchen-centos7-py3-pytest
diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
diff --git a/.ci/kitchen-centos7-py3-tcp-pytest b/.ci/kitchen-centos7-py3-tcp-pytest
diff --git a/.ci/kitchen-centos8-py3 b/.ci/kitchen-centos8-py3
diff --git a/.ci/kitchen-centos8-py3-pytest b/.ci/kitchen-centos8-py3-pytest
diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3
diff --git a/.ci/kitchen-debian10-py3-pytest b/.ci/kitchen-debian10-py3-pytest
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
diff --git a/.ci/kitchen-debian9-py3-pytest b/.ci/kitchen-debian9-py3-pytest