rallytime 49f57ba3f1 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/utils/win_functions.py		2017-01-25 09:59:29 -07:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
fileserver.py	Fix for new integration test for fileserver.clear_file_list_cache	2016-09-13 15:55:51 -05:00
jobs.py	Fix incorrect key for return data	2016-09-03 14:59:04 -05:00
manage.py	A more liberal search minion strings in manage test	2016-09-07 12:37:29 +09:00
runner_returns.py	Update usage of run_run_plus to remove unused "options" argument	2016-09-03 14:59:04 -05:00
salt.py	Update Carbon versionadded tags to 2016.11.0 in tests/*	2016-10-27 10:04:13 -06:00
state.py	Increasing timeouts for running integrations tests	2017-01-23 16:55:48 +00:00
winrepo.py	Allow to blacklist/whitelist renderers. (#33358)	2016-05-20 10:41:51 -07:00