Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 5F83A171CB for ; Tue, 7 Oct 2014 15:45:27 +0000 (UTC) Received: (qmail 36563 invoked by uid 500); 7 Oct 2014 15:45:27 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36471 invoked by uid 500); 7 Oct 2014 15:45:27 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 36171 invoked by uid 99); 7 Oct 2014 15:45:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2014 15:45:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A715F8B5E68; Tue, 7 Oct 2014 15:45:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Tue, 07 Oct 2014 15:45:29 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17a4fbda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17a4fbda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17a4fbda Branch: refs/heads/trunk Commit: 17a4fbdaac4562db475272b79c94fa90aa423dd8 Parents: 7f26410 9873960 Author: Aleksey Yeschenko Authored: Tue Oct 7 18:44:19 2014 +0300 Committer: Aleksey Yeschenko Committed: Tue Oct 7 18:44:19 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../cassandra/net/IncomingTcpConnection.java | 21 ++++++++++---------- .../apache/cassandra/net/MessagingService.java | 2 +- .../cassandra/net/OutboundTcpConnection.java | 7 +++++-- 4 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17a4fbda/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17a4fbda/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------