rallytime a65c60d862 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/state.py - salt/utils/hashutils.py - tests/integration/modules/test_state.py		2018-10-02 15:09:51 -04:00
..
cli	Simplify cli test fixes	2018-08-30 12:49:41 -07: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.3' into '2018.3'	2018-08-24 14:08:30 -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 '2017.7' into '2018.3'	2018-10-02 15:09:51 -04:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	Fix extra space	2018-04-24 16:15:11 -07:00
loader	Call sync_all to fix Windows test case	2018-07-21 18:00:59 -07:00
minion	Merge branch '2017.7' into '2018.3'	2018-08-10 13:12:14 -04:00
modules	Merge branch '2017.7' into '2018.3'	2018-10-02 15:09:51 -04:00
netapi	Merge branch '2018.3.3' into '2018.3'	2018-09-30 12:39:44 -04:00
output	Fix lint and test failures caused by bad merge	2018-08-31 14:08:58 -04:00
pillar	Remove unused imports	2018-02-07 14:44:15 -06:00
proxy	Add unicode_literals to tops, thorium, proxy, tokens	2017-12-14 21:56:49 -06: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	Mark orchestration test as expensive	2018-09-18 20:02:50 -04:00
scheduler	Lint.	2018-08-08 14:33:25 -07:00
sdb	[PY3] Add unicode_literals to sdb and serializers	2017-12-28 13:18:00 -06:00
shell	Add more tests to whitelist	2018-09-19 11:21:10 -06: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 issue-49043	2018-09-30 09:18:54 -05:00
utils	Add more tests to whitelist	2018-09-19 11:21:10 -06: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