rallytime e0ae50e489 Merge branch '2017.7' into 'develop' ... Conflicts: - pkg/salt.bash - salt/client/mixins.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/boto_vpc.py - salt/modules/win_pkg.py - salt/utils/reactor.py - tests/unit/utils/test_reactor.py		2017-09-22 10:24:04 -04:00
..
conf	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
engines	Make sure runtests_engine is ASCII text	2017-06-05 17:30:28 -06:00
ext-conf	Move sshd_config file to another directory to avoid problems.	2014-05-12 19:06:09 +01:00
extension_modules	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
file	Merge branch '2017.7' into 'develop'	2017-09-22 10:24:04 -04:00
file.replace	Fix tests for #18841.	2014-12-18 01:51:26 +01:00
log_handlers	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
over	Remove trailing white spaces in tests files	2016-03-01 17:40:02 +02:00
pillar/base	Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"	2017-07-19 12:25:22 +03:00
ssh	Make sure that ssh keys don't get added with incorrect encoding types.	2013-10-15 11:48:28 -06:00
ext.yaml	Add backend for initial ext_pillar tests	2012-04-08 21:31:08 -06:00
hosts	Split out integration tests from pure unit tests.	2012-02-20 13:18:13 +01:00
mysql_returner_archiver_data.sql	WIP MySQL returner archiver	2016-08-16 10:33:26 -06:00
reactor-sync-minion.sls	Rewrite the tests_valid_docs test	2017-02-26 12:21:00 -06:00