rallytime 8d1e1e7f94 Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - Gemfile - pkg/windows/build_env_2.ps1 - pkg/windows/build_env_3.ps1 - pkg/windows/req.txt - salt/client/ssh/__init__.py - salt/client/ssh/ssh_py_shim.py - salt/modules/boto_vpc.py - salt/modules/file.py - salt/modules/heat.py - salt/modules/smartos_vmadm.py - salt/modules/win_dsc.py - salt/returners/elasticsearch_return.py - salt/runners/salt.py - salt/states/module.py - salt/utils/win_functions.py - setup.py - tests/integration/modules/test_state.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py		2018-03-15 17:22:05 -04:00
..
cli	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07: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-03-15 17:22:05 -04: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 '2018.3'	2018-03-15 17:22:05 -04: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	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
netapi	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07: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	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
scheduler	Removing unnecessary log.	2018-02-21 13:14:05 -08: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-03-06 13:45:59 -05:00
spm	Mark 2 tests as flaky	2018-02-23 09:34:14 -05:00
ssh	Merge branch '2018.3.0rc1' into '2018.3'	2018-03-02 14:22:07 -05:00
states	Merge pull request #46398 from rallytime/merge-2018.3	2018-03-12 16:25:18 -04: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	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07:00