mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
5548ed771d
* 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 |
||
|---|---|---|
| .. | ||
| salt-api.1 | ||
| salt-call.1 | ||
| salt-cloud.1 | ||
| salt-cp.1 | ||
| salt-key.1 | ||
| salt-master.1 | ||
| salt-minion.1 | ||
| salt-proxy.1 | ||
| salt-run.1 | ||
| salt-ssh.1 | ||
| salt-syndic.1 | ||
| salt-unity.1 | ||
| salt.1 | ||
| salt.7 | ||
| spm.1 | ||