Merge pull request saltstack#15768 from jacksontj/conserve_channels

Channels already do the reauth
wesleylancel · Sep 15, 2014 · d16c973 · d16c973
2 parents 494f7f9 + f1ce35d
commit d16c973
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/salt/minion.py b/salt/minion.py
@@ -843,12 +843,6 @@ def _fire_master(self, data=None, tag=None, events=None, pretag=None):
         channel = salt.transport.Channel.factory(self.opts)
         try:
             result = channel.send(load)
-        except AuthenticationError:
-            log.info("AES key changed, re-authenticating")
-            self.authenticate()
-        except SaltReqTimeoutError:
-            log.info("Master failed to respond. Preforming re-authenticating")
-            self.authenticate()
         except Exception:
             log.info("fire_master failed: {0}".format(traceback.format_exc()))