Colton Myers 73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cli/daemons.py salt/master.py salt/minion.py salt/modules/gpg.py salt/modules/pw_group.py salt/utils/http.py setup.py tests/unit/modules/schedule_test.py		2015-08-19 11:29:45 -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	Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version	2015-06-25 15:14:21 -06:00
files	Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version	2015-06-25 15:14:21 -06:00
fileserver	More test fixes	2015-07-22 10:40:49 -05:00
loader	Add new module type for serializers from issue #22257.	2015-05-28 20:03:11 -04:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Fix git.clone tests to reflect new return data	2015-08-18 03:39:27 -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	Remove overstate tests	2015-06-17 11:14:19 -06: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-08-19 11:29: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	Shutdown the multiprocessing logging queue listener	2015-08-03 21:37:56 +01:00