Ch3LL 178dab3a4b Merge branch 2017.7 into 2018.3 ... Conflicts: - doc/topics/tutorials/salt_bootstrap.rst - tests/integration/cloud/clouds/test_digitalocean.py		2018-11-14 10:33:44 -05:00
..
cli	Merge branch '2017.7' into '2018.3'	2018-11-05 12:54:30 -05:00
client	Update test to reflect type change due to unicode_literals	2018-02-01 10:30:12 -06:00
cloud	Merge branch 2017.7 into 2018.3	2018-11-14 10:33:44 -05: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-11-05 12:54:30 -05: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	Update old utils paths to use new paths	2018-11-12 16:13:35 -05:00
modules	Merge branch '2017.7' into '2018.3'	2018-11-12 16:11:17 -05:00
netapi	Merge pull request #50201 from Ch3LL/_2018.3.3	2018-10-24 15:44:23 -04:00
output	Fix lint and test failures caused by bad merge	2018-08-31 14:08:58 -04:00
pillar	Remove unicode references	2018-11-07 16:55:55 +00: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	Make target test job more specific to reduce test flakiness	2018-11-08 10:27:41 -05:00
scheduler	Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests.	2018-10-24 17:22:37 -07:00
sdb	[PY3] Add unicode_literals to sdb and serializers	2017-12-28 13:18:00 -06:00
shell	Merge branch 2017.7 into 2018.3	2018-11-14 10:33:44 -05: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-31 09:57:46 -04:00
states	Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs.	2018-11-01 16:47:02 -07: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