Colton Myers b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py salt/cloud/clouds/gce.py salt/cloud/clouds/linode.py salt/grains/ssds.py salt/modules/git.py salt/modules/pip.py tests/integration/cloud/providers/gogrid.py tests/integration/cloud/providers/linode.py tests/integration/cloud/providers/msazure.py tests/integration/cloud/providers/rackspace.py tests/unit/modules/pip_test.py		2015-08-28 16:33:54 -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-08-28 16:33:54 -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	No shell needed when checking git version	2015-08-24 11:32:51 -05:00
netapi	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -06:00
output	Merge branch '2015.2' into develop	2015-02-27 10:02:47 +00:00
runners	Lint fixes	2015-08-21 13:48:55 -05:00
shell	add tcp transport to shell.key tests	2015-07-20 17:02:25 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	git.latest: add test for no rev	2015-08-18 16:38:24 +02: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	fix transport settings in 3083c71	2015-07-21 16:42:33 -06:00