Colton Myers e92dc99e9a Merge branch '2014.7' into temp-merge-forward ... Conflicts: salt/minion.py		2014-09-12 10:37:24 -06:00
..
cli	pylint fix	2014-07-09 22:31:54 -06:00
client	Make sure test_full_returns passes for RAET	2014-07-09 09:32:50 -06:00
cloud	Merge pull request #15676 from rallytime/ec2_cloud_tests	2014-09-12 08:23:51 +01:00
files	Update ec2 provider and profile config files for cloud nightly tests	2014-09-08 17:06:45 -06:00
fileserver	Get effective username using pwd.getpwduid()	2014-08-21 15:22:54 -05:00
loader	No need to iterate through keys	2014-06-21 15:34:33 +01:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge pull request #15104 from srkunze/feature/safe_env	2014-09-08 14:48:58 -06:00
netapi	Add integration test for logging out of the rest_cherrypy app	2014-08-15 09:45:30 -04:00
output	No need to be root to run these tests	2014-05-12 19:09:55 +01:00
runner	Add tests for the cmd_sync and cmd_async RunnerClient methods	2014-07-24 16:08:30 -06:00
runners	Fix the output now that we are using the default output (nested) instead of hard coding it to yaml	2014-04-19 15:59:13 -07:00
shell	Merge branch '2014.7' into develop	2014-08-20 14:39:31 -06:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Remove reference to nonexistant function in pkg tests	2014-08-27 13:52:36 -05:00
wheel	Fix failing integration tests for the wheel client	2014-08-26 19:20:25 -06:00
__init__.py	Merge branch '2014.7' into temp-merge-forward	2014-09-12 10:37:24 -06:00