Merge pull request #23258 from teizz/ret_keepalive_2014_7_5

TCP keepalives on the ret side, Revisited.
This commit is contained in:
Mike Place 2015-05-01 10:13:49 -06:00
commit 83ef7cb114

View file

@ -217,7 +217,7 @@ class ZeroMQChannel(Channel):
log.debug('Removed obsolete sreq-object from '
'sreq_cache for master {0}'.format(check_key[0]))
ZeroMQChannel.sreq_cache[key] = salt.payload.SREQ(self.master_uri)
ZeroMQChannel.sreq_cache[key] = salt.payload.SREQ(self.master_uri, opts=self.opts)
return ZeroMQChannel.sreq_cache[key]