rallytime 3b74d123af Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/selinux.py - salt/modules/zypper.py - salt/pillar/__init__.py - salt/states/dockerng.py - tests/runtests.py		2016-02-25 12:36:22 -07: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	Updates made after PR review:	2016-01-25 18:02:10 +00:00
files	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -07:00
fileserver	Add __role to master opts for gitfs integration tests	2016-02-02 21:58:50 -06:00
loader	loader test for external grains deep merge (non-functional)	2015-11-20 08:44:29 +01: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-02-25 12:36:22 -07: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 remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -07: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	add integration tests for minion blackout	2016-02-19 18:04:31 -07:00