Merge pull request #30823 from yannis666/fix-for-mine-update-merge2

Fix for mine to merge configuration on update.
saltstack · Feb 2, 2016 · ec4e2bb · ec4e2bb
2 parents d24b9f1 + 99c7c12
commit ec4e2bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/modules/mine.py b/salt/modules/mine.py
@@ -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:

diff --git a/tests/unit/modules/mine_test.py b/tests/unit/modules/mine_test.py
@@ -39,7 +39,7 @@ def test_update(self):
         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',