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 18B7411E16 for ; Tue, 12 Aug 2014 18:45:16 +0000 (UTC) Received: (qmail 91841 invoked by uid 500); 12 Aug 2014 18:45:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91773 invoked by uid 500); 12 Aug 2014 18:45:14 -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 91481 invoked by uid 99); 12 Aug 2014 18:45:14 -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, 12 Aug 2014 18:45:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 372529218F4; Tue, 12 Aug 2014 18:45:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 12 Aug 2014 18:45:23 -0000 Message-Id: <3865e64082234c919234196b62b0b662@git.apache.org> In-Reply-To: <2726d776bbad49fab4017435545fddc1@git.apache.org> References: <2726d776bbad49fab4017435545fddc1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] 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/26bde8df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26bde8df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26bde8df Branch: refs/heads/trunk Commit: 26bde8dfef5bbd9909cdab1dc31a988ea1c1fe22 Parents: 0cf2e14 70f277f Author: Brandon Williams Authored: Tue Aug 12 13:34:02 2014 -0500 Committer: Brandon Williams Committed: Tue Aug 12 13:34:02 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26bde8df/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ----------------------------------------------------------------------