rallytime 2222e1cae9 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/modules/napalm_network.py - tests/integration/states/test_archive.py - tests/integration/states/test_file.py - tests/unit/modules/test_docker.py		2017-03-21 10:19:52 -06:00
..
cli	Sort list of minions in batch to make tests consistent	2017-03-16 12:00:38 -05:00
client	Pylint fix	2017-03-08 16:24:03 -07:00
cloud	Use salt.utils.versions instead of distutils.version	2017-03-08 19:22:33 +00:00
files	Catch and handle tornado.iostream.StreamClosedError exceptions	2017-03-09 19:29:16 +00:00
fileserver	Merge pull request #39746 from terminalmage/pathutils	2017-03-14 11:00:34 -06:00
grains	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
loader	Cleanup after ourselves	2017-03-08 18:34:32 +00:00
minion	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge pull request #40129 from terminalmage/py3-tests	2017-03-17 17:49:26 -06:00
netapi	Add flaky decorator to flaky rest_tornado test	2017-03-14 16:30:54 -06:00
output	Redundant	2017-03-01 01:33:08 +00:00
reactor	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
renderers	Merge branch 'develop' into win_fix_renderers_tests	2017-03-02 10:29:36 -07:00
returners	Merge pull request #39696 from twangboy/win_fix_returners_tests	2017-03-01 10:24:59 -07:00
runners	Changes to imports to comport with test suite changes in develop	2017-03-10 11:05:02 -06:00
sdb	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
shell	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
ssh	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
states	Merge branch '2016.11' into 'develop'	2017-03-21 10:19:52 -06:00
utils	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
wheel	Cleanup after ourselves	2017-03-08 18:34:32 +00:00
__init__.py	This no longer applies.	2017-03-08 18:34:31 +00:00