Thomas S Hatch 6d38d2db62 Merge branch '2014.7' into develop ... Conflicts: salt/utils/__init__.py		2014-11-14 14:38:55 -07:00
..
index.rst	Add info about running unittests w/o integration test daemons	2014-09-28 10:52:37 -06:00
integration.rst	Added expensiveTest documentation to cloud testing docs	2014-06-11 11:17:27 -06:00
unit.rst	Merge branch '2014.7' into develop	2014-11-14 14:38:55 -07:00