Colton Myers 24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/configuration/minion.rst salt/config.py salt/modules/sudo.py tests/integration/states/file.py		2015-07-02 09:46:36 -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	Pylint fix - remove unused import	2015-02-11 09:35:04 -07: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	Fixed more testing stuff, an egregious error	2015-06-29 12:27:22 -06:00
netapi	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-29 16:49:40 -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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-02 09:46:36 -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	Manual merge of #24414 per thatch45	2015-06-06 07:47:52 -06:00