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 01FDD11625 for ; Tue, 3 Jun 2014 06:14:41 +0000 (UTC) Received: (qmail 56365 invoked by uid 500); 3 Jun 2014 06:14:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56222 invoked by uid 500); 3 Jun 2014 06:14:40 -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 56142 invoked by uid 99); 3 Jun 2014 06:14:40 -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, 03 Jun 2014 06:14:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 769A892C978; Tue, 3 Jun 2014 06:14:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 03 Jun 2014 06:14:42 -0000 Message-Id: <597d10e9b94c434db747aa3f3afb4254@git.apache.org> In-Reply-To: <9afca32fc5854f30ac7cf39040b7248f@git.apache.org> References: <9afca32fc5854f30ac7cf39040b7248f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] 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/4b477b45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b477b45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b477b45 Branch: refs/heads/trunk Commit: 4b477b45981de09f23a13186e015b26870bfd514 Parents: ac8d3c1 d0c90e0 Author: Marcus Eriksson Authored: Tue Jun 3 08:02:17 2014 +0200 Committer: Marcus Eriksson Committed: Tue Jun 3 08:02:17 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/streaming/StreamReader.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b477b45/CHANGES.txt ----------------------------------------------------------------------