rallytime 60370f5fb6 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/daemons/masterapi.py - salt/proxy/dummy.py - salt/states/file.py - tests/integration/modules/test_state.py - tests/integration/runners/test_runner_returns.py - tests/integration/ssh/test_state.py - tests/support/parser/__init__.py - tests/unit/grains/test_core.py - tests/unit/states/test_file.py		2018-01-11 16:00:08 -05:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
test_alternatives.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_archive.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_boto_sns.py	Don't attempt connections at the module level!	2017-04-28 13:33:32 +01:00
test_bower.py	Replace json module usage with a helper to ensure unicode content is handled properly	2017-12-27 09:30:58 -06:00
test_chocolatey.py	Put tests behind try block	2017-12-11 15:18:03 -07:00
test_cmd.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
test_compiler.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_docker_container.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
test_docker_network.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
test_file.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
test_git.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_handle_error.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_handle_iorder.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_host.py	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06:00
test_keystone.py	Merge branch '2016.11' into 'nitrogen'	2017-05-30 10:16:14 -06:00
test_match.py	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06:00
test_mysql.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_network.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_npm.py	Support states returning a list for ret['comment']	2017-09-05 19:52:42 +00:00
test_pip.py	Merge branch '2016.11' into '2017.7'	2017-12-20 10:26:10 -05:00
test_pkg.py	pylint fixes	2017-12-04 15:38:23 +01:00
test_pkgrepo.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_rabbitmq_user.py	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
test_rabbitmq_vhost.py	Use the more portable helper skip_if_not_root.	2017-04-04 18:58:21 +01:00
test_renderers.py	Merge branch '2016.11' into '2017.7'	2017-07-20 09:54:08 -06:00
test_service.py	Merge branch '2017.7' into 'oxygen'	2018-01-11 16:00:08 -05:00
test_ssh.py	Improvements to SSH known_hosts module and state.	2017-09-19 13:28:48 +10:00
test_supervisord.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_svn.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_user.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_virtualenv.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
test_zookeeper.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00