mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Do not merge previous values in pillar include loop.
This commit is contained in:
parent
3942b4d0e6
commit
a42c51f9bf
1 changed files with 10 additions and 10 deletions
|
@ -522,17 +522,17 @@ class Pillar(object):
|
|||
mods,
|
||||
defaults
|
||||
)
|
||||
if nstate:
|
||||
if key:
|
||||
nstate = {
|
||||
key: nstate
|
||||
}
|
||||
if nstate:
|
||||
if key:
|
||||
nstate = {
|
||||
key: nstate
|
||||
}
|
||||
|
||||
state = merge(
|
||||
state,
|
||||
nstate,
|
||||
self.merge_strategy,
|
||||
self.opts.get('renderer', 'yaml'))
|
||||
state = merge(
|
||||
state,
|
||||
nstate,
|
||||
self.merge_strategy,
|
||||
self.opts.get('renderer', 'yaml'))
|
||||
|
||||
if err:
|
||||
errors += err
|
||||
|
|
Loading…
Add table
Reference in a new issue