Merge pull request #31627 from jakehilton/2015.8

Handling error from using gevent 1.1.
saltstack · Mar 2, 2016 · cc4c31c · cc4c31c
2 parents 191241e + 02fb5ed
commit cc4c31c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/salt/state.py b/salt/state.py
@@ -804,6 +804,8 @@ def module_refresh(self):
                 reload(site)
             except RuntimeError:
                 log.error('Error encountered during module reload. Modules were not reloaded.')
+            except TypeError:
+                log.error('Error encountered during module reload. Modules were not reloaded.')
         self.load_modules(proxy=self.proxy)
         if not self.opts.get('local', False) and self.opts.get('multiprocessing', True):
             self.functions['saltutil.refresh_modules']()