Cherry picking fixes from master

strattond · Nov 9, 2013 · e0c8a11 · e0c8a11
1 parent f6293d2
commit e0c8a11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,6 +76,7 @@ tests/test_reqrep_device_tipc
 tests/test_reqrep_tipc
 tests/test_router_handover
 tests/test_router_mandatory_tipc
+tests/test_router_raw_empty
 tests/test_shutdown_stress_tipc
 tests/test_sub_forward_tipc
 tests/test_term_endpoint_tipc

diff --git a/NEWS b/NEWS
@@ -1,17 +1,18 @@
-0MQ version 4.0.1 stable, released on 2013/xx/xx
+0MQ version 4.0.2 stable, released on 2013/xx/xx
 ================================================
 
 Bug Fixes
 ---------
 
+* Fixed LIBZMQ-583 - improved low-res timer for Windows 
 * Fixed LIBZMQ-578 - z85_decode was extremely slow
-
-* Fixed LIBZMQ-569 - Socket server crashes with random client data
-
+* Fixed LIBZMQ-577 - fault in man pages.
+* Fixed LIBZMQ-574 - assertion failure when ran out of system file handles
 * Fixed LIBZMQ-571 - test_stream failing in some cases
-
+* Fixed LIBZMQ-569 - Socket server crashes with random client data
+* Fixed LIBZMQ-39 - Bad file descriptor during shutdown
 * Pulled expected failing test_linger.cpp from release
-
+* Reduced pause time in tests to allow "make check" to run faster
 
 0MQ version 4.0.1 stable, released on 2013/10/08
 ================================================

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -39,7 +39,6 @@ noinst_PROGRAMS = test_system \
                   test_conflate \
                   test_inproc_connect \
                   test_issue_566 \
-                  test_proxy \
                   test_abstract_ipc \
                   test_many_sockets