rallytime 23c5a4ca3e Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py - salt/states/file.py - tests/integration/states/test_file.py - tests/unit/states/test_file.py		2017-12-07 17:33:03 -05:00
..
cli	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
client	Lint fixes	2017-07-21 16:14:32 -06:00
cloud	remove unnecessary try/except block	2017-12-04 16:18:01 -05:00
externalapi	tag venafi as destructive and expensive	2017-05-25 15:15:49 -06:00
files	Merge branch '2017.7' into ssh_pillar_items	2017-11-29 09:39:38 -05:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
loader	The file listing needs to be sorted to return expectable results.	2017-06-01 18:47:22 +01:00
minion	Remove unnecessary pass statement	2017-05-25 14:31:36 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge pull request #44748 from twangboy/osx_fix_auto_login	2017-12-07 09:22:22 -05:00
netapi	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
output	Lint: Remove extra empty lines at end of files	2017-12-01 14:46:27 -05:00
pillar	Skip git_pillar tests on MacOSX	2017-06-06 17:17:57 -04:00
proxy	Add state, grains and service proxy tests	2017-10-24 16:59:56 -04:00
reactor	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
renderers	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
returners	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
runners	Add orchestration tests when target exists or not	2017-11-10 12:00:12 -05:00
sdb	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
shell	fix pylint	2017-12-05 14:39:36 -05:00
spm	Include file size check for test_spm_build_big_file test	2017-10-31 18:18:37 -04:00
ssh	Merge pull request #44712 from Ch3LL/ssh_pillar_items	2017-11-30 10:29:32 -05:00
states	Merge branch '2016.11' into '2017.7'	2017-12-07 17:33:03 -05:00
utils	Avoid race condition when iterating through processes	2017-06-29 15:08:17 -05:00
wheel	Merge branch '2016.11' into 'nitrogen'	2017-05-04 11:49:33 -06:00
__init__.py	Add masterless state.highstate integration test	2017-11-29 10:15:56 -05:00