saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30609 from seanjnkns/backport_30602

Browse source 
Fix documentation for pillar_merge_lists which default is False, not …
This commit is contained in:
Nicole Thomas 2016-01-25 10:15:45 -07:00
commit 89b4f3de1b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/configuration/master.rst
View file

@ -2327,7 +2327,7 @@ strategy between different sources. It accepts 4 values:
.. versionadded:: 2015.8.0
Default: ``True``
Default: ``False``
Recursively merge lists by aggregating them instead of replacing them.