rallytime 2c052e34b3 Merge branch '2017.7' into 'develop' ... Conflicts: - .gitignore - salt/modules/win_lgpo.py - salt/utils/__init__.py - tests/integration/spm/test_build.py - tests/unit/test_pydsl.py		2017-11-05 20:28:51 -07:00
..
cli	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
client	Adding some integration tests.	2017-08-15 20:24:40 -07:00
cloud	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
externalapi	tag venafi as destructive and expensive	2017-05-25 15:15:49 -06:00
files	Merge pull request #42349 from coredumb/saltclass	2017-09-28 14:26:45 +02: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-11-05 20:28:51 -07:00
netapi	Complete the salt.utils refactor	2017-10-15 09:43:31 -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	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	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	Complete the salt.utils refactor	2017-10-15 09:43:31 -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-10-16 15:26:19 -04:00
spm	Include file size check for test_spm_build_big_file test	2017-10-31 18:18:37 -04:00
ssh	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
states	Merge branch 'develop' into ssh_known_hosts_improvements	2017-10-19 13:44:29 -04: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	Merge branch '2017.7' into 'develop'	2017-11-05 20:28:51 -07:00