Thomas S Hatch 1cfd7f7d66 Merge branch '2014.7' into develop ... Conflicts: salt/netapi/rest_tornado/saltnado.py		2014-09-30 11:40:15 -06:00
..
cli	Actually, just fix pylint	2014-09-25 12:36:00 -06:00
client	Add a regression test for #16240	2014-09-29 16:37:53 -07:00
cloud	Remove 'running' check - it's not reliable	2014-09-23 15:06:08 -06:00
files	Update ec2 provider and profile config files for cloud nightly tests	2014-09-18 20:41:08 -06:00
fileserver	Get effective username using pwd.getpwduid()	2014-08-21 15:22:54 -05: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	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	changing param back to backend in fileserver to improve useability	2014-09-22 11:16:27 -06:00
shell	its 'Denied Keys', not 'Denied Minions'	2014-09-24 14:10:49 +02: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	create minions_denied in test-env, update wheel-test to expect minions_denied	2014-09-22 19:44:24 +02:00
__init__.py	create minions_denied in test-env, update wheel-test to expect minions_denied	2014-09-22 19:44:24 +02:00