Erik Johnson cb4db56eb5 Allow pillar.get to merge list as well as dictionaries ... This also gets rid of the exception that used to be raised when the default was not of the proper type, and instead skips merging in those cases.		2017-04-06 12:24:22 -05:00
..
integration	Fixup a syntax error	2017-03-14 11:15:02 -06:00
perf	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
unit	Allow pillar.get to merge list as well as dictionaries	2017-04-06 12:24:22 -05:00
utils	Lint fix	2016-10-25 16:53:18 +09:00
__init__.py
buildpackage.py	Merge branch '2015.8' into '2016.3'	2016-05-09 13:55:06 -06:00
committer_parser.py	lint	2015-03-10 15:37:49 -06:00
consist.py
eventlisten.py	Subscribe event to bus is optional now	2015-08-03 16:10:38 -06:00
eventlisten.sh	Move giant eventlisten.sh example out of the state.event docstring	2015-09-10 13:38:09 -06:00
jenkins.py	Splay sleeps inside jenkins	2015-12-16 14:48:51 -07:00
minionswarm.py	Add rand-ver option	2015-09-23 16:09:23 -06:00
modparser.py	No empty docstrings	2015-07-12 19:26:33 +01:00
packdump.py
runtests.py	Merge branch '2015.8' into '2016.3'	2016-08-17 10:37:57 -06:00
salt-tcpdump.py	Revert py3modernize lint changes (#34339)	2016-06-28 16:04:02 -04:00
saltsh.py
wheeltest.py