rallytime 4abfd26e86 Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py		2018-05-23 12:33:00 -04:00
..
ext	Use bytestrings for struct.pack/unpack	2018-01-27 17:34:16 -06:00
parser	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
__init__.py	Moved some test supporting modules to tests/support	2017-02-28 22:52:48 +00:00
case.py	Merge branch '2017.7' into '2018.3'	2018-05-09 11:24:02 -04:00
cherrypy_testclasses.py	Use setUpClass instead of __init__	2017-04-28 13:33:37 +01:00
copyartifacts.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
cptestcase.py	Replace all usage of six.b	2018-01-24 09:17:28 -06:00
docker.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
gitfs.py	[PY3] Add unicode_literals to ext_pillar modules	2018-01-04 08:46:40 -06:00
helpers.py	Merge branch '2017.7' into '2018.3'	2018-05-09 11:24:02 -04:00
jinja_filters.py	Fixing test_path_which to check that the filter is available rather than results.	2018-04-11 08:19:07 -07:00
mixins.py	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
mock.py	Use mock 2.0.0 instead of unittest.mock on Python 3 (#2)	2018-02-13 20:16:03 +01:00
napalm.py	import absolute paths	2017-11-29 10:00:41 +11:00
paths.py	Merge branch '2017.7' into '2018.3'	2018-05-23 12:33:00 -04:00
processes.py	Merge pull request #41617 from cro/n_proxy_tests	2017-06-15 12:07:29 -05:00
runtests.py	Replace json module usage with a helper to ensure unicode content is handled properly	2017-12-27 09:30:58 -06:00
unit.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
win_installer.py	Use aboslute imports	2018-03-28 22:32:30 -07:00
xmlunit.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00