7 Commits

Author	SHA1	Message	Date
Sean Jenkins	e44a30620b	Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead	2016-01-19 15:06:30 -07:00
rallytime	9ea33bf0e4	Pylint fixes	2015-10-16 07:22:46 -06:00
Domingo Kiser	4af5b5c33f	introduce recurse_list pillar_source_merging_strategy	2015-10-16 05:24:40 -06:00
Mike Place	cfb6982227	Adding some dictupdate merge tests ... Add new option for top_file_merging_strategy to config Add master config file option Adding additional tests Lexicographical test works Make default strategy Simplify to just an option about whether or not to merge Changes Implement ordered top files Implement merge strategies and default top files Lint Doc rewrite and start on ordering Remove debugging Moving to env_order Adding env_order Still writing tests More tests and docs	2015-08-11 11:28:40 -06:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Thayne Harbaugh	7bd7e4c2b7	Appease the pylint gods; back-out unrelated changes.	2014-10-24 11:32:12 -06:00
Thayne Harbaugh	65e477dd67	Improve filter_by() base argument: ... * Change filter_by() base argument to a key in lookup_dict rather than a dictionary. This allows more compact usage and more readable use of base values/defaults in the lookup_dict. * Change/improve function-local documentation for lookup_dict(). * Add specific use-case of "base" argument for lookup_dict() in the formulas documentation. * Expand filter_by() unit testing to validate use of base argument. * Add unit test for salt.utils.dictupdate.update() to provide complete depth-of-testing of filter_by() which uses dictupdate.update().	2014-10-24 11:13:47 -06:00