rallytime 5952e3e300 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/mac_brew.py - salt/states/archive.py		2016-04-28 15:35:34 -06:00
..
cli	Ensure all integration test classes and funcs are documented w/examples	2016-03-04 12:13:27 -07:00
client	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
cloud	Pylint fixes	2016-03-18 16:27:06 -06:00
files	[develop] Merge forward from 2016.3 to develop (#32494)	2016-04-11 17:07:15 -06:00
fileserver	Add __role to master opts for gitfs integration tests	2016-02-02 21:58:50 -06:00
loader	Pylint fixes	2016-03-18 12:21:09 -06:00
minion	add integration tests for minion blackout	2016-02-19 18:04:31 -07:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
netapi	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -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	Remove unused import	2016-02-19 09:51:18 -07:00
shell	fix some shell tests for MacOS (#32852)	2016-04-26 09:47:35 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2016.3' into 'develop'	2016-04-28 15:35:34 -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	Cast to dict to fix wheel tests in tcp	2015-11-12 12:21:52 -07:00
__init__.py	[develop] Merge forward from 2016.3 to develop (#32494)	2016-04-11 17:07:15 -06:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00