Skip to content

Commit 14eb5a5

Browse files
dwozdwoz
authored
Merge branch 'master' into 55061_fix_network_settings_beacon_wildcard_interface
2 parents f9894ce + 0ae1f74 commit 14eb5a5

File tree

751 files changed

+15068
-7282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

751 files changed

+15068
-7282
lines changed

‎.ci/docs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runDocs(
44
env: env)

‎.ci/kitchen-amazon1-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-amazon2-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-amazon2-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-archlts-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-archlts-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos6-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2-cloud

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 0,

‎.ci/kitchen-centos7-py2-m2crypto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2-proxy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2-pycryptodomex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2-tcp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py2-tornado

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py3-cloud

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 0,

‎.ci/kitchen-centos7-py3-m2crypto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py3-proxy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py3-pycryptodomex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos7-py3-tcp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-centos8-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-debian10-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-debian8-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-debian9-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-debian9-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-fedora30-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-fedora30-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-fedora31-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-macosxhighsierra-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-macosxhighsierra-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-macosxmojave-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-macosxmojave-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-macosxsierra-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-macosxsierra-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
// Pre-nox pipeline
44
runTestSuite(

‎.ci/kitchen-opensuse15-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-opensuse15-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2-m2crypto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2-proxy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2-pycryptodomex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2-tcp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py2-tornado

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py3-m2crypto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py3-proxy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py3-pycryptodomex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1604-py3-tcp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1804-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-ubuntu1804-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-windows2016-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-windows2016-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-windows2019-py2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/kitchen-windows2019-py3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runTestSuite(
44
concurrent_builds: 1,

‎.ci/lint

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('salt@master-1.5') _
1+
@Library('salt@master-1.6') _
22

33
runLint(
44
env: env)

0 commit comments

Comments
 (0)