Matt Parlette efcefd6579 Updated master.d/f_defaults for 2014.7 ... Added config setting for: * pillar_source_merging_strategy		2015-04-15 15:36:09 -04:00
..
cloud.maps.d	Initial add of dummy saltify settings	2014-12-24 08:40:10 +00:00
cloud.profiles.d	Initial add of dummy saltify settings	2014-12-24 08:40:10 +00:00
cloud.providers.d	cloud.providers.d can now be redirected.	2015-04-03 19:30:26 -04:00
master.d	Updated master.d/f_defaults for 2014.7	2015-04-15 15:36:09 -04:00
minion.d	Added mine_functions to f_defaults.conf.	2015-04-03 14:34:34 -04:00
key
roster.jinja