rallytime e060a74fd8 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/cloud/clouds/dimensiondata.py - salt/config/__init__.py - salt/modules/yumpkg.py - salt/pillar/ec2_pillar.py - salt/utils/docker/__init__.py - salt/utils/vault.py - tests/integration/states/test_docker_container.py - tests/unit/modules/test_yumpkg.py - tests/unit/templates/test_jinja.py - tests/unit/utils/test_docker.py		2018-02-14 16:31:31 -05:00
..
cli	[PY3] Add unicode_literals to cache and cli modules	2018-01-13 21:08:51 -06: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 'oxygen'	2018-02-14 16:31:31 -05:00
daemons	[PY3] Add unicode_literals to daemons modules	2018-01-05 15:34:48 -06:00
externalapi	tag venafi as destructive and expensive	2017-05-25 15:15:49 -06:00
files	Merge branch '2017.7' into 'oxygen'	2018-02-14 16:31:31 -05:00
fileserver	These are not integration tests	2017-04-01 14:22:51 +01:00
grains	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06:00
loader	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
minion	Replace all usage of six.b	2018-01-24 09:17:28 -06:00
mockbin
modules	Merge branch 'oxygen.rc1' into 'oxygen'	2018-02-13 10:54:25 -05:00
netapi	Distinguish between Authorization and Authentication errors	2018-01-23 17:05:22 -05:00
output	Python 3 doesn't have 'u' before unicode strings	2018-01-13 21:08:51 -06: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	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01: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	Increase timeout for orchestration test	2018-01-23 19:34:23 -06:00
scheduler	Updating utils/schedule.py to be able to track when jobs are skipped because of the max_running parameter. This change moves that check out of handle_func and moves it to it's own function. Also updated skip tests to include a test that _skip_reason is included in the results when a job is skipped.	2018-02-07 11:39:10 -08:00
sdb	[PY3] Add unicode_literals to sdb and serializers	2017-12-28 13:18:00 -06:00
shell	Distinguish between Authorization and Authentication errors	2018-01-23 17:05:22 -05:00
spm	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05:00
ssh	Further fixes to for salt-ssh test under heavy load	2018-01-22 07:33:42 -05:00
states	Merge pull request #45941 from terminalmage/issue45679	2018-02-12 11:28:36 -05:00
utils	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -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	Fix stacktrace at the end of a test	2018-01-25 18:45:43 +00:00