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 EAB5D11303 for ; Thu, 15 May 2014 02:20:49 +0000 (UTC) Received: (qmail 12221 invoked by uid 500); 10 May 2014 21:58:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 61881 invoked by uid 500); 10 May 2014 21:56:21 -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 56677 invoked by uid 99); 10 May 2014 21:56:09 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 673C49991CD; Fri, 9 May 2014 23:52:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Fri, 09 May 2014 23:52:30 -0000 Message-Id: In-Reply-To: <1dfcd9d35eda4922902e065526b72e7f@git.apache.org> References: <1dfcd9d35eda4922902e065526b72e7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/c807b42d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c807b42d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c807b42d Branch: refs/heads/trunk Commit: c807b42d70535e5e25b91d8454f363fd5a6a0245 Parents: 11c8a22 7b398c5 Author: Dave Brosius Authored: Fri May 9 19:51:55 2014 -0400 Committer: Dave Brosius Committed: Fri May 9 19:51:55 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c807b42d/CHANGES.txt ----------------------------------------------------------------------