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 #29400 from twangboy/fix_19332

Browse source 
Fix #19332
This commit is contained in:
Mike Place 2015-12-03 13:25:16 -07:00
commit 8fe39d0ef8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/topics/pillar/index.rst
View file

@ -215,7 +215,10 @@ The resulting pillar will be as follows:
9.9.5
.. note::
Remember: conflicting keys will be overwritten in a non-deterministic manner!
Pillar files are applied in the order they are listed in the top file.
Therefore conflicting keys will be overwritten in a 'last one wins' manner!
For example, in the above scenario conflicting key values in ``services``
will overwrite those in ``packages`` because it's at the bottom of the list.
Including Other Pillars
=======================