Merge branch '2018.3' into fix_lgpo

This commit is contained in:
Shane Lee 2019-03-08 11:09:54 -07:00 committed by GitHub
commit 71864059bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -211,8 +211,6 @@ class AsyncZeroMQReqChannel(salt.transport.client.ReqChannel):
'''
if hasattr(self, 'message_client'):
self.message_client.destroy()
else:
log.debug('No message_client attr for AsyncZeroMQReqChannel found. Not destroying sockets.')
@property
def master_uri(self):