Nicole Thomas 84ff63875c [2016.11] Merge forward from 2016.3 to 2016.11 (#39234) ... * Fix for #38697 * Lint fixes * Added missing source_hash_name argument in get_managed function Additional fix to #33187 Customer was still seeing errors, this should now work. Tested with 2015.8.13 and 2016.11.2 * [2016.3] Pylint fix (#39202) * Ignore empty dicts in highstate outputter Closes #37174 * Sort the return list from the fileserver.envs runner * Fix the win_ip_test failures (#39230) The changes made in #38793 changes the "get_all_ointerfaces" call to be a list of DNS servers. This change adjusts the tests structure from a string to a list and fixes the test failure.		2017-02-07 16:06:56 -07:00
..
integration	Apply fix from #38705 to 2016.3 branch (#39077)	2017-02-03 09:35:49 -07:00
perf
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
unit	[2016.11] Merge forward from 2016.3 to 2016.11 (#39234)	2017-02-07 16:06:56 -07:00
utils	Merge branch '2016.3' into 'carbon'	2016-10-25 10:39:02 -06:00
__init__.py
buildpackage.py	[develop] Merge forward from 2016.3 to develop (#33193)	2016-05-12 07:53:39 -07:00
committer_parser.py
consist.py
eventlisten.py
eventlisten.sh
jenkins.py
minionswarm.py	Ensure 'data' remains a dictionary if conf file is empty or missing	2016-07-26 12:41:42 -06:00
modparser.py
packdump.py
runtests.py	Account for a not recent enough salt-testing library	2016-08-23 19:04:49 +01:00
salt-tcpdump.py	Revert py3modernize lint changes (#34339)	2016-06-28 16:04:02 -04:00
saltsh.py
wheeltest.py
whitelist.txt	Add whitelist for windows tests	2016-08-23 11:22:24 -07:00