rallytime b1e505f80e Merge branch '2016.3' into 'develop' ... Conflicts: - doc/topics/releases/2015.5.11.rst - doc/topics/releases/2015.8.9.rst - salt/cloud/clouds/nova.py - salt/minion.py		2016-05-13 09:47:46 -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	Merge branch '2016.3' into 'develop'	2016-05-06 16:05:58 -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	Add timezone integration test for Solaris (#33167)	2016-05-12 14:40:37 -07:00
netapi	Replace args and kwargs (plural) by arg and kwarg (singular) for `RunnerClient` (#32938)	2016-05-05 07:31:08 -07: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	[develop] Merge forward from 2016.3 to develop (#33193)	2016-05-12 07:53:39 -07:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2016.3' into 'develop'	2016-05-13 09:47:46 -06:00
utils	* Improve init script: specifically manage salt configurations rather than arbitrary salt processes (#32666)	2016-05-09 10:57:13 -07:00
wheel	Cast to dict to fix wheel tests in tcp	2015-11-12 12:21:52 -07:00
__init__.py	* Improve init script: specifically manage salt configurations rather than arbitrary salt processes (#32666)	2016-05-09 10:57:13 -07:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00