rallytime 67cdfd28ad Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/cp.py - salt/modules/testinframod.py - salt/states/jenkins.py - tests/unit/utils/test_find.py		2017-08-22 09:07:26 -04:00
..
cli	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
client	Merge branch '2017.7' into 'develop'	2017-07-26 17:51:36 -06:00
cloud	Initial commit of oneandone salt cloud driver.	2017-08-17 08:03:01 +00:00
externalapi	tag venafi as destructive and expensive	2017-05-25 15:15:49 -06:00
files	Merge branch '2017.7' into 'develop'	2017-08-22 09:07:26 -04:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
loader	The file listing needs to be sorted to return expectable results.	2017-06-01 18:47:22 +01:00
minion	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch '2017.7' into 'develop'	2017-08-18 09:28:26 -04:00
netapi	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
output	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
pillar	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05: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	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
returners	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
runners	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
sdb	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06:00
shell	Merge branch '2017.7' into 'develop'	2017-08-17 09:30:50 -04:00
ssh	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
states	Move 4 functions from salt.utils to salt.utils.versions	2017-08-15 12:53:57 -05:00
utils	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
wheel	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
__init__.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00