Colton Myers 3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/clouds/vmware.py salt/modules/rh_ip.py salt/modules/s3.py salt/modules/saltutil.py salt/modules/zypper.py salt/spm/__init__.py salt/utils/aws.py salt/utils/s3.py tests/unit/modules/s3_test.py tests/unit/pydsl_test.py		2015-12-01 15:31:03 -07: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	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-12-01 15:31:03 -07:00
fileserver	More test fixes	2015-07-22 10:40:49 -05:00
loader	loader test for external grains deep merge (non-functional)	2015-11-20 08:44:29 +01: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-12-01 15:31:03 -07: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
renderers	Add __init__ and pydsl test	2015-11-25 10:50:30 -07:00
runners	Lint fixes	2015-08-21 13:48:55 -05:00
shell	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Added sys import	2015-11-19 14:42:15 -07: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	Cast to dict to fix wheel tests in tcp	2015-11-12 12:21:52 -07:00
__init__.py	loader test for custom grains	2015-11-18 22:08:24 +01:00