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

whitespace cleanup

Browse source
This commit is contained in:
Bruno Binet 2015-07-10 09:00:18 +02:00
parent 989175defa
commit 7dfd8b59ce
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/pillar/stack.py
View file

@ -293,7 +293,6 @@ Then you can specify the merging strategy to select using the ``__`` key:
| | uid: 1001 | |
+----------------------+-----------------------+-------------------------+
'''
import os
import logging
from functools import partial
@ -365,7 +364,7 @@ def _cleanup(obj):
del obj[0]
return obj
def _merge_dict(stack, obj):
strategy = obj.pop('__', 'merge-last')
if strategy not in strategies: