Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D4010200B5F for ; Sat, 9 Jul 2016 02:24:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D2C92160A77; Sat, 9 Jul 2016 00:24:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 292CA160A7D for ; Sat, 9 Jul 2016 02:24:47 +0200 (CEST) Received: (qmail 21864 invoked by uid 500); 9 Jul 2016 00:24:45 -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 21367 invoked by uid 99); 9 Jul 2016 00:24:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Jul 2016 00:24:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25C04EAD9A; Sat, 9 Jul 2016 00:24:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Sat, 09 Jul 2016 00:24:52 -0000 Message-Id: <8df90bd7a5cf461788e79f96b4c874c9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9 archived-at: Sat, 09 Jul 2016 00:24:47 -0000 Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1417a516 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1417a516 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1417a516 Branch: refs/heads/cassandra-3.9 Commit: 1417a516cf7cc89dc456eb8c9c7e2759811a6991 Parents: c1dcc9c 2fa44cd Author: Yuki Morishita Authored: Fri Jul 8 19:12:34 2016 -0500 Committer: Yuki Morishita Committed: Fri Jul 8 19:12:34 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1417a516/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ----------------------------------------------------------------------