Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 861A517388 for ; Thu, 14 May 2015 16:48:03 +0000 (UTC) Received: (qmail 69193 invoked by uid 500); 14 May 2015 16:48:03 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 69168 invoked by uid 500); 14 May 2015 16:48:03 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 69157 invoked by uid 99); 14 May 2015 16:48:03 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2015 16:48:03 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 4D317AC0043 for ; Thu, 14 May 2015 16:48:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1679402 - /zookeeper/branches/branch-3.5/CHANGES.txt Date: Thu, 14 May 2015 16:48:03 -0000 To: commits@zookeeper.apache.org From: hdeng@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150514164803.4D317AC0043@hades.apache.org> 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