Colton Myers 26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/conf.py salt/config/__init__.py salt/modules/rh_ip.py salt/pillar/s3.py salt/returners/local_cache.py salt/states/user.py salt/templates/rh_ip/rh7_eth.jinja		2015-09-17 11:10:37 -06:00
..
cli	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
client	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
cloud	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
files	Also add -Z to script args for cloud tests	2015-08-24 16:11:01 -06:00
fileserver	More test fixes	2015-07-22 10:40:49 -05:00
loader	Fix tests	2015-08-28 13:50:31 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-03 14:24:45 -06:00
netapi	Remove mocks from rest_cherrypy integration tests	2015-09-09 10:39:35 -06:00
output	Lint	2015-08-27 13:46:29 -06:00
runners	Lint fixes	2015-08-21 13:48:55 -05:00
shell	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-03 14:24:45 -06:00
utils	cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"	2015-01-28 18:43:43 -08:00
wheel	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
__init__.py	Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop	2015-09-06 12:42:58 +01:00