rallytime f6d9cdc633 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/ref/states/compiler_ordering.rst - doc/topics/installation/suse.rst - doc/topics/jobs/schedule.rst - doc/topics/targeting/grains.rst - doc/topics/tutorials/preseed_key.rst - doc/topics/tutorials/states_pt5.rst - pkg/suse/use-forking-daemon.patch - salt/minion.py - salt/modules/pacman.py - salt/modules/state.py - salt/modules/yumpkg.py		2016-03-25 11:47:16 -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	Updates made after PR review:	2016-01-25 18:02:10 +00:00
files	tests...runtests_helpers: use system tmpdir	2016-03-10 10:57:18 -07: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 '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
netapi	Remove mocks from rest_cherrypy integration tests	2015-09-09 10:39:35 -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	Merge branch '2015.8' into '2016.3'	2016-03-18 11:26:12 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Lint fix	2016-03-24 16:33:18 -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	try to change the test run to always clean the thindir	2016-03-24 10:40:23 -06:00
fileclient_test.py	Pylint fix	2016-02-29 11:12:55 -07:00