Merge pull request #394 from hintjens/master

Fixed HWM doc on ZMQ_PULL

Merge pull request #394 from hintjens/master
Fixed HWM doc on ZMQ_PULL
77dd0a6f · Martin Hurtoň · e7f59297 · 8d96a439 · 77dd0a6f · 77dd0a6f
Commit 77dd0a6f authored Jul 04, 2012 by Martin Hurtoň
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.gitignore .gitignore +1 -0

zmq_socket.txt doc/zmq_socket.txt +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ tests/test_ts_context
 tests/test_connect_resolve
 tests/test_connect_delay
 tests/test_term_endpoint
+tests/test_router_behavior
 src/platform.hpp*
 src/stamp-h1
 perf/local_lat

--- a/doc/zmq_socket.txt
+++ b/doc/zmq_socket.txt
@@ -297,7 +297,7 @@ Direction:: Unidirectional
 Send/receive pattern:: Receive only
 Incoming routing strategy:: Fair-queued
 Outgoing routing strategy:: N/A
-ZMQ_HWM option action:: N/A
+ZMQ_HWM option action:: Block


 Exclusive pair pattern