Dan Colish edfb3d2560 Merge branch 'develop' of git://github.com/saltstack/salt into develop ... Conflicts: tests/unit/utils/find_test.py		2012-06-30 12:46:04 -07:00
..
client	Refactor runtests to allow dotted path module discovery.	2012-05-29 19:56:47 -07:00
files	Add test for recuse error	2012-06-19 10:29:14 -06:00
modules	Hardcode /tmp/subsalttest dir in ssh module integration tests	2012-06-30 11:46:31 -07:00
runners	Refactor runtests to allow dotted path module discovery.	2012-05-29 19:56:47 -07:00
shell	Fix salt key tests for new no_color option	2012-06-05 18:10:59 -06:00
states	Move tmp hosts file management to test case which requires it. Fix	2012-06-30 12:20:53 -07:00
tmp	Split out integration tests from pure unit tests.	2012-02-20 13:18:13 +01:00
__init__.py	Merge branch 'develop' of git://github.com/saltstack/salt into develop	2012-06-30 12:46:04 -07:00