rallytime 58262608cd Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/config/__init__.py - salt/master.py - salt/modules/zypper.py - tests/unit/modules/timezone_test.py		2017-06-16 10:43:02 -06:00
..
integration	Merge pull request #41617 from cro/n_proxy_tests	2017-06-15 12:07:29 -05:00
perf	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
support	Merge pull request #41617 from cro/n_proxy_tests	2017-06-15 12:07:29 -05:00
unit	Merge branch '2016.11' into '2017.7'	2017-06-16 10:43:02 -06:00
utils	Misplaced test. Use tests.support.unit instead.	2017-04-01 14:23:00 +01:00
__init__.py
buildpackage.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
committer_parser.py	Fix resource leakage	2017-04-05 23:18:00 +01:00
conftest.py	Fix basic stats when the test daemons are not running	2017-04-28 13:36:45 +01:00
consist.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
eventlisten.py
eventlisten.sh
jenkins.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
minionswarm.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
modparser.py
packdump.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
runtests.py	specify when to run venafi tests	2017-05-25 10:27:40 -06:00
salt-tcpdump.py	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
saltsh.py
wheeltest.py
whitelist.txt	Add back the two loader tests	2017-04-17 14:04:20 -06:00