rallytime dc23823897 Merge branch '2014.7' into '2015.2' ... Conflicts: salt/modules/localemod.py		2015-01-27 13:24:14 -07:00
..
cli	Fix failing test	2014-12-15 12:04:35 -07:00
client	Switch open() for salt.utils.fopen()	2014-11-26 17:39:49 +00:00
cloud	Remove 'running' check - it's not reliable	2014-09-23 15:06:08 -06:00
files	Merge branch '2014.7' into '2015.2'	2015-01-27 13:24:14 -07:00
fileserver	Allow getting the configuration from scratch.	2014-10-08 01:00:06 +01:00
loader	Fix linode test failures and test all modules	2014-09-25 11:34:50 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Pylint fixes for the 2015.2 branch	2015-01-23 10:57:18 -07:00
netapi	Fix order for proper diff on failure	2015-01-24 03:16:51 +00:00
output	pep8	2014-10-13 15:32:11 -06:00
runners	Fix up tests	2014-11-10 15:42:45 -07:00
shell	Merge branch '2014.7' into 2015.2	2015-01-11 22:40:16 +00:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Loosen test constraint and update runas arg	2015-01-24 03:16:50 +00:00
wheel	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00
__init__.py	Merge branch '2014.7' into 2015.2	2015-01-11 22:40:16 +00:00