rallytime 7aa31ff030 Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/grains/core.py - salt/modules/git.py - salt/modules/pillar.py - salt/states/saltmod.py - salt/states/user.py - tests/integration/states/handle_iorder.py		2017-07-18 09:05:43 -06:00
..
cli	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
client	Lint fix	2017-06-23 10:18:06 -06:00
cloud	Add integration test for salt.cloud.CloudClient.create() function	2017-06-29 14:37:12 -06:00
externalapi	tag venafi as destructive and expensive	2017-05-25 15:15:49 -06:00
files	Back porting the fix for 2017.7 that ensures the order of the names parameter.	2017-07-06 12:12:50 -07: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 branch '2016.11' into '2017.7'	2017-07-18 09:05:43 -06:00
netapi	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
output	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
pillar	Skip git_pillar tests on MacOSX	2017-06-06 17:17:57 -04:00
proxy	Rename proxy test files to use test_* syntax	2017-05-24 13:03:21 -06: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	specify when to run venafi tests	2017-05-25 10:27:40 -06:00
sdb	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
shell	Add integration test for 42116	2017-07-05 11:07:38 -05:00
ssh	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
states	Back porting the fix for 2017.7 that ensures the order of the names parameter.	2017-07-06 12:12:50 -07: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	Port salt-proxy tests to the testsuite changes in Nitrogen.	2017-06-06 13:49:16 -06:00