Nicole Thomas 5548ed771d Back-port #36435 to 2016.3 (#36532) ... * Added "none" option for pillar_source_merging_strategy * added none to merging strategy in dictupdate so we no longer log warnings when it is selected * Updated documentation * fix for when pillar_source_merging_strategy is not set * Fix looking up pillar data when merging is set to "none" and no saltenv was passed * Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry * Let's not break when no merging strategy is passed * Capitalisation * Update on doc		2016-09-23 13:36:23 -06:00
..
cloud.maps.d	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.profiles.d	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.providers.d	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
cloud	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02:00
cloud.profiles	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.providers	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Back-port #36435 to 2016.3 (#36532)	2016-09-23 13:36:23 -06:00
minion	Merge branch '2015.8' into '2016.3'	2016-09-08 10:55:57 -06:00
proxy	Add documentation for append_minionid_config_dirs.	2016-08-03 12:36:37 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00