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 #36724 from rallytime/bp-36628

Browse source 
Back-port #36628 to 2016.3
This commit is contained in:
Mike Place 2016-10-01 18:33:43 +09:00 • committed by GitHub
commit 97713b09f5
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``: