rallytime 9ff2694155 Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/salt-minion.service - salt/modules/junos.py - salt/modules/localemod.py - salt/modules/win_system.py - salt/states/junos.py - tests/unit/modules/test_localemod.py - tests/unit/modules/test_win_powercfg.py - tests/unit/states/dockerng_test.py		2017-05-24 16:32:59 -06:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
test_arguments.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_auth.py	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
test_call.py	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
test_cloud.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_cp.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_enabled.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_key.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_master_tops.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_master.py	Check master shut down correctly.	2017-05-23 11:53:56 +03:00
test_matcher.py	Merge branch '2016.11' into 'nitrogen'	2017-05-05 10:11:11 -06:00
test_minion.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
test_proxy.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
test_runner.py	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
test_saltcli.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
test_syndic.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00