Skip to content

Commit a5a6b42

Browse files
sagetheragesagetherage
authored
Merge branch 'master' into patch-5
2 parents e9979b6 + b95213e commit a5a6b42

589 files changed

Lines changed: 94446 additions & 361389 deletions

File tree

Some content is hidden

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

‎.ci/kitchen-centos7-py3-proxy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ runTestSuite(
1212
nox_passthrough_opts: '--proxy',
1313
python_version: 'py3',
1414
testrun_timeout: 6,
15+
force_run_full: true,
16+
disable_from_filenames: true,
1517
use_spot_instances: true)
1618

1719
// vim: ft=groovy

‎.ci/kitchen-ubuntu1604-py3-proxy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ runTestSuite(
1212
nox_passthrough_opts: '--proxy',
1313
python_version: 'py3',
1414
testrun_timeout: 6,
15+
force_run_full: true,
16+
disable_from_filenames: true,
1517
use_spot_instances: true)
1618

1719
// vim: ft=groovy

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# Blacken Salt
22
0b2a5613b345f17339cb90e60b407199b3d26980
3+
# Blacken Docs
4+
f335a40f71446876969f53fbedc18a958ddb2890

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ salt/modules/reg.py @saltstack/team-windows @saltstack/team-core
6060
salt/states/reg.py @saltstack/team-windows @saltstack/team-core
6161
tests/*/*win* @saltstack/team-windows @saltstack/team-core
6262
tests/*/test_reg.py @saltstack/team-windows @saltstack/team-core
63+
tests/pytests/* @saltstack/team-code @s0undt3ch
6364

6465
# Jenkins Integration
6566
.ci/* @saltstack/saltstack-sre-team @saltstack/team-core

0 commit comments

Comments
 (0)