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

Fix for mine to merge configuration on update.

Browse Source 
This fix was previously applied to 2015.5.
It fixes #30722
This commit is contained in:
yannis 2016-02-02 10:43:00 -08:00
parent 3cb7a9ee54
commit 99c7c12aba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/mine.py
View File

@ -102,7 +102,7 @@ def update(clear=False):
salt '*' mine.update
'''
m_data = __salt__['config.option']('mine_functions', {})
m_data = __salt__['config.merge']('mine_functions', {})
data = {}
for func in m_data:
try:

2
tests/unit/modules/mine_test.py
View File

@ -39,7 +39,7 @@ class MineTestCase(TestCase):
Test for Execute the configured functions
'''
with patch.dict(mine.__salt__,
{'config.option': MagicMock(return_value={'A': 'B'}),
{'config.merge': MagicMock(return_value={'A': 'B'}),
'data.update': MagicMock(return_value='A'),
'A': MagicMock(return_value='B')}):
with patch.dict(mine.__opts__, {'file_client': 'local',