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

Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy

Browse source
This commit is contained in:
Yoram Hekma 2016-09-28 07:23:53 +02:00 • committed by rallytime
parent 48d2b01e6c
commit 3bb2cb6379
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2648,6 +2648,7 @@ The pillar_source_merging_strategy option allows you to configure merging
strategy between different sources. It accepts 5 values:
* ``none``:
.. versionadded:: 2016.3.4
It will not do any merging at all and only parse the pillar data from the passed environment and 'base' if no environment was specified.
* ``recurse``: