Merge branch 'master' into docs/fix-links-to-serializers

saltstack · Apr 14, 2020 · a6ae9a8 · a6ae9a8
2 parents 870f48e + e1cf6ec
commit a6ae9a8
Show file tree

Hide file tree

Showing 2,792 changed files with 432,748 additions and 369,113 deletions.
diff --git a/.ci/docs b/.ci/docs
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runDocs(
     env: env)

diff --git a/.ci/kitchen-amazon1-py2 b/.ci/kitchen-amazon1-py2
diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-archlts-py2 b/.ci/kitchen-archlts-py2
diff --git a/.ci/kitchen-archlts-py3 b/.ci/kitchen-archlts-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
diff --git a/.ci/kitchen-centos7-py2-cloud b/.ci/kitchen-centos7-py2-cloud
diff --git a/.ci/kitchen-centos7-py2-m2crypto b/.ci/kitchen-centos7-py2-m2crypto
diff --git a/.ci/kitchen-centos7-py2-proxy b/.ci/kitchen-centos7-py2-proxy
diff --git a/.ci/kitchen-centos7-py2-pycryptodomex b/.ci/kitchen-centos7-py2-pycryptodomex
diff --git a/.ci/kitchen-centos7-py2-tcp b/.ci/kitchen-centos7-py2-tcp
diff --git a/.ci/kitchen-centos7-py2-tornado b/.ci/kitchen-centos7-py2-tornado
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-cloud b/.ci/kitchen-centos7-py3-cloud
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 0,

diff --git a/.ci/kitchen-centos7-py3-m2crypto b/.ci/kitchen-centos7-py3-m2crypto
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-proxy b/.ci/kitchen-centos7-py3-proxy
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-pycryptodomex b/.ci/kitchen-centos7-py3-pycryptodomex
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-centos8-py3 b/.ci/kitchen-centos8-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-debian10-py3 b/.ci/kitchen-debian10-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-fedora30-py2 b/.ci/kitchen-fedora30-py2
diff --git a/.ci/kitchen-fedora30-py3 b/.ci/kitchen-fedora30-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-fedora31-py3 b/.ci/kitchen-fedora31-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 runTestSuite(
     concurrent_builds: 1,

diff --git a/.ci/kitchen-macosxhighsierra-py2 b/.ci/kitchen-macosxhighsierra-py2
diff --git a/.ci/kitchen-macosxhighsierra-py3 b/.ci/kitchen-macosxhighsierra-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(

diff --git a/.ci/kitchen-macosxmojave-py2 b/.ci/kitchen-macosxmojave-py2
diff --git a/.ci/kitchen-macosxmojave-py3 b/.ci/kitchen-macosxmojave-py3
@@ -1,4 +1,4 @@
-@Library('salt@master-1.6') _
+@Library('salt@master-1.7') _
 
 // Pre-nox pipeline
 runTestSuite(

diff --git a/.ci/kitchen-macosxsierra-py2 b/.ci/kitchen-macosxsierra-py2