rallytime 13a09fc31d Remove extra line left over from merge conflict resolution		2017-04-28 10:13:47 -06:00
..
cli	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
client	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
cloud	Merge branch '2016.11' into 'nitrogen'	2017-04-10 14:09:25 -06:00
files	Add tests for Zookeeper states	2017-04-24 18:01:16 -06:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
loader	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
minion	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch 'nitrogen' into 'develop'	2017-04-28 09:26:26 -06:00
netapi	Fix cherrypy memory leakage	2017-04-28 13:33:35 +01:00
output	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
reactor	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
renderers	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
returners	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
runners	Remove extra line left over from merge conflict resolution	2017-04-28 10:13:47 -06:00
sdb	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
shell	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
ssh	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
states	Merge branch 'nitrogen' into 'develop'	2017-04-28 09:26:26 -06:00
utils	Take care of resource leakage on tests	2017-04-04 18:58:20 +01:00
wheel	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
__init__.py	Tell python that we're done with this dictionary	2017-04-28 13:33:37 +01:00