rallytime eec9d69387 Merge branch '2015.5' into '2015.8' ... Conflicts: salt/modules/virtualenv_mod.py salt/states/file.py tests/integration/__init__.py		2015-11-04 15:52:59 -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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
files	Changed grain to look at osmajorrelease instead of osrelease	2015-10-14 10:42:55 -06:00
fileserver	More test fixes	2015-07-22 10:40:49 -05:00
loader	Fix tests	2015-08-28 13:50:31 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-30 16:05:26 -06:00
netapi	Remove mocks from rest_cherrypy integration tests	2015-09-09 10:39:35 -06:00
output	Merge branch '2015.2' into develop	2015-02-27 10:02:47 +00:00
runners	Lint fixes	2015-08-21 13:48:55 -05:00
shell	add tcp transport to shell.key tests	2015-07-20 17:02:25 -06:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Fix lint errors	2015-10-07 17:49:07 +02: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	Merge branch '2015.5' into '2015.8'	2015-11-04 15:52:59 -07:00