valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Default options were never returned if omit_pillar flag was set to false

Browse Source
This commit is contained in:
Michał Jarco 2013-01-19 13:31:49 +01:00
parent 2a3ac0b7c9
commit e05cc0c10d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/config.py
View File

@ -92,7 +92,7 @@ def option(
if not omit_pillar:
if value in __pillar__:
return __pillar__[value]
elif value in DEFAULTS:
if value in DEFAULTS:
return DEFAULTS[value]
return default