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_cache.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_fileserver.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_jobs.py	Merge branch '2016.11' into 'nitrogen'	2017-05-24 16:32:59 -06:00
test_manage.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_runner_returns.py	Don't hardcode to root	2017-04-28 13:33:33 +01:00
test_salt.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_state.py	Minor cleanup changes	2017-04-28 13:33:34 +01:00