rallytime 201031fa8a Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt.7 - doc/ref/configuration/minion.rst - salt/cloud/clouds/ec2.py - salt/returners/highstate_return.py - tests/support/gitfs.py - tests/unit/loader/test_loader.py		2018-08-10 13:12:14 -04:00
..
__init__.py	cache runner test: add new unit tests	2015-11-18 16:33:46 -07:00
test_cache.py	Add unicode_literals to runner modules	2017-12-14 19:30:14 -06:00
test_jobs.py	Add unicode_literals to runner modules	2017-12-14 19:30:14 -06:00
test_queue.py	Add unicode_literals to runner modules	2017-12-14 19:30:14 -06:00
test_vault.py	Add unicode_literals to runner modules	2017-12-14 19:30:14 -06:00
test_winrepo.py	Merge branch '2017.7' into '2018.3'	2018-08-10 13:12:14 -04:00