saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2018.3.3' into '2018.3'

Browse source 
Conflicts:
  - tests/whitelist.txt
This commit is contained in:
rallytime 2018-09-17 12:04:44 -04:00
commit f3b122f4e3
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/whitelist.txt
View file

@ -14,6 +14,7 @@ integration.minion.test_pillar
integration.minion.test_timeout
integration.modules.test_aliases
integration.modules.test_archive
integration.modules.test_autoruns
integration.modules.test_beacons
integration.modules.test_cmdmod
integration.modules.test_config
@ -23,6 +24,7 @@ integration.modules.test_decorators
integration.modules.test_disk
integration.modules.test_event
integration.modules.test_file
integration.modules.test_firewall
integration.modules.test_gem
integration.modules.test_gentoolkitmod
integration.modules.test_git
@ -38,6 +40,7 @@ integration.modules.test_mysql
integration.modules.test_nacl
integration.modules.test_network
integration.modules.test_nilrt_ip
integration.modules.test_ntp
integration.modules.test_pillar
integration.modules.test_pip
integration.modules.test_pkg
@ -54,10 +57,7 @@ integration.modules.test_sysmod
integration.modules.test_system
integration.modules.test_test
integration.modules.test_useradd
integration.modules.test_win_autoruns
integration.modules.test_win_dns_client
integration.modules.test_win_firewall
integration.modules.test_win_ntp
integration.modules.test_win_pkg
integration.modules.test_win_servermanager
integration.reactor.test_reactor