rallytime 52111eb01a Merge branch '2016.3' into 'develop' ... Conflicts: - salt/cloud/clouds/joyent.py - salt/minion.py		2016-03-18 16:00:35 -06:00
..
mixins	be more consistent with logging.warning vs logging.warn (deprecated) and quoting style	2016-02-22 21:30:15 +00:00
__init__.py	Fix TCP transport presence events to work with a NAT	2016-01-25 19:38:49 -06:00
client.py	AsyncTCPReqChannel will fail after 10 uses	2015-11-09 09:47:17 -07:00
frame.py	Remove unecessary double packing of msg	2015-12-02 09:17:33 -08:00
ipc.py	ZeroMQ no longer required when transport is TCP	2015-12-07 20:22:16 -06:00
local.py	Merge branch '2015.8' into '2016.3'	2016-03-18 11:26:12 -06:00
raet.py	Fix salt-call using RAET on Windows	2015-05-04 12:02:37 -05:00
server.py	Python 3 Compat for new transport files	2015-04-14 09:16:42 -06:00
tcp.py	Don't send REQ while another one is waiting for response.	2016-03-11 10:16:09 -07:00
zeromq.py	Don't send REQ while another one is waiting for response.	2016-03-11 10:16:09 -07:00