You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@zookeeper.apache.org by hd...@apache.org on 2015/05/14 18:48:03 UTC

svn commit: r1679402 - /zookeeper/branches/branch-3.5/CHANGES.txt

Author: hdeng
Date: Thu May 14 16:48:02 2015
New Revision: 1679402

URL: http://svn.apache.org/r1679402
Log:
ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chris Nauroth via hdeng)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1679402&r1=1679401&r2=1679402&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu May 14 16:48:02 2015
@@ -125,12 +125,7 @@ IMPROVEMENTS:
   ZOOKEEPER-2153 X509 Authentication Documentation
   (Ian Dimayuga via hdeng)
 
-<<<<<<< HEAD
-  ZOOKEEPER-2186 QuorumCnxManager#receiveConnection may crash with random input
-  (rgs via michim)
-=======
   ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chris Nauroth via hdeng)
->>>>>>> ZOOKEEPER-2183 Concurrent Testing Processes and Port Assignments (Chris Nauroth via hdeng)
 
 Release 3.5.0 - 8/4/2014