rallytime 8fed338708 Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/spm/pkgfiles/local.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py		2018-10-25 10:31:06 -04:00
..
cli	Merge branch '2018.3' into 'fluorine'	2018-10-18 10:41:42 -04:00
client	Update test to reflect type change due to unicode_literals	2018-02-01 10:30:12 -06:00
cloud	Merge branch '2018.3' into 'fluorine'	2018-08-28 12:06:32 -04:00
daemons	[PY3] Add unicode_literals to daemons modules	2018-01-05 15:34:48 -06:00
doc	Update old utils paths to new paths	2018-04-03 14:46:56 -04:00
externalapi	Rename venafi test module to bring it closer to the naming convention	2018-08-14 13:53:30 -05:00
files	Merge branch '2018.3' into 'fluorine'	2018-10-25 10:31:06 -04:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	Allow for passing in previously compiled grains to custom grain modules	2018-04-27 15:22:38 -05:00
loader	Call sync_all to fix Windows test case	2018-07-21 18:00:59 -07:00
logging	mark log jid test as flaky	2018-10-18 14:54:09 -05:00
minion	fix lint	2018-10-03 10:51:06 -04:00
modules	Merge branch '2018.3' into 'fluorine'	2018-10-22 14:41:20 -04:00
netapi	Merge branch '2018.3' into 'fluorine'	2018-10-25 10:31:06 -04:00
output	Fix lint and test failures caused by bad merge	2018-08-31 14:08:58 -04:00
pillar	Make Pillar no longer munge file_roots	2018-10-10 13:10:50 -05:00
proxy	Fix values in proxy caller tests	2018-10-01 16:55:26 -05:00
reactor	Skip some unreliable tests	2018-09-13 10:33:59 -04:00
renderers	[PY3] Add unicode_literals to renderers and returners	2017-12-15 00:17:26 -06:00
returners	[PY3] Add unicode_literals to renderers and returners	2017-12-15 00:17:26 -06:00
runners	Merge branch '2018.3' into 'fluorine'	2018-09-19 14:07:06 -04:00
scheduler	Merge branch '2018.3' into 'fluorine'	2018-10-25 10:31:06 -04:00
sdb	Fixing test_vault for python3.	2018-10-15 12:07:56 -07:00
shell	Merge branch '2018.3' into 'fluorine'	2018-10-18 10:41:42 -04:00
spm	Merge branch '2017.7' into '2018.3'	2018-04-03 14:33:11 -04:00
ssh	Revert "Allow for not being prompted to supply a password to deploy keys to a…"	2018-08-30 16:22:29 -05:00
states	Merge branch '2018.3' into 'fluorine'	2018-10-25 10:31:06 -04:00
utils	remove extra imports	2018-10-23 11:28:54 -05:00
wheel	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
__init__.py	Merge branch '2018.3.3' into '2018.3'	2018-08-24 14:08:30 -04:00