Intchanter f663dd2c46 Merge branch 'develop' of https://github.com/saltstack/salt into develop ... Conflicts: salt/states/network.py setup.py tests/integration/__init__.py		2012-07-08 22:50:12 -06:00
..
client	Refactor runtests to allow dotted path module discovery.	2012-05-29 19:56:47 -07:00
files	Add sock_dir verification to tests	2012-07-07 22:11:36 -06:00
modules	Merge branch 'develop' of https://github.com/saltstack/salt into develop	2012-07-04 18:29:13 -06:00
runners	Refactor runtests to allow dotted path module discovery.	2012-05-29 19:56:47 -07:00
shell	PEP8 fixes for tests	2012-06-30 14:10:34 -06:00
states	Destructive tests now fail properly.	2012-06-30 17:28:48 -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 https://github.com/saltstack/salt into develop	2012-07-08 22:50:12 -06:00