rallytime eb61788f87 Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/runners/all/index.rst - salt/modules/win_lgpo.py - salt/states/dockerio.py		2017-02-01 16:36:45 -07:00
..
cli	Merge branch '2016.3' into '2016.11'	2016-11-14 09:14:00 -07:00
client	Merge branch '2016.3' into '2016.11'	2016-11-14 09:14:00 -07:00
cloud	Merge branch '2016.11' into 'develop'	2017-01-06 10:31:51 -05:00
files	Merge branch '2016.11' into 'develop'	2017-01-03 10:17:18 -05:00
fileserver	Merge branch '2016.3' into '2016.11'	2017-02-01 13:35:10 -07:00
grains	add windows core grain test	2016-09-07 21:22:24 -06:00
loader	Make integration.loader.loader tests PY3-compatible	2016-08-03 17:21:31 -05:00
minion	Revert "Skip some tests on MacOS" (#36341)	2016-09-15 11:12:04 -06:00
mockbin
modules	Merge branch '2016.11' into 'develop'	2017-02-01 16:36:45 -07:00
netapi	Merge branch '2016.3' into '2016.11'	2017-01-16 18:54:14 -07:00
output	reverted json log changes	2016-11-04 11:09:45 +01:00
reactor	Event assert (#33262)	2016-05-19 13:41:23 -06:00
renderers	Add __init__ and pydsl test	2015-11-25 10:50:30 -07:00
returners	Fix cache test on develop	2016-08-21 13:35:27 +09:00
runners	Merge branch '2016.11' into 'develop'	2017-01-25 09:59:29 -07:00
sdb	Add SDB module for environment variables	2016-05-25 17:18:35 -04:00
shell	Merge branch '2016.11' into 'develop'	2017-02-01 16:36:45 -07:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Skip new managed file state test on Windows	2017-01-30 13:40:25 -07:00
utils	Various fixes for MacOS X (#36085)	2016-09-06 16:30:08 -06:00
wheel	Add final args to disable event printing for wheel	2016-08-22 14:51:47 +09:00
__init__.py	Fix geteuid stacktrace on Windows	2017-01-30 15:36:08 -07:00