saltstack/salt — pull request #4218 by jacksontj (2013-03-23 01:59:40+00:00)
Title: Fix multiplication problem for #3431

The pyzmq bindings already do the conversion to milliseconds (https://github.com/zeromq/pyzmq/blob/master/zmq/eventloop/ioloop.py) So instead of sleeping 60 seconds, we are sleeping 60000 seconds (~16 hours) which is causing the cli to "never return"

In addition we aren't passing the timeout of the command from the client down tot the zmq socket