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 4DC1F110EC for ; Thu, 14 Aug 2014 20:51:18 +0000 (UTC) Received: (qmail 59051 invoked by uid 500); 14 Aug 2014 20:51:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 58908 invoked by uid 500); 14 Aug 2014 20:51:17 -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 58805 invoked by uid 99); 14 Aug 2014 20:51:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Aug 2014 20:51:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A4F129C3CD5; Thu, 14 Aug 2014 20:51:17 +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: Thu, 14 Aug 2014 20:51:21 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/c4077ad6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4077ad6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4077ad6 Branch: refs/heads/trunk Commit: c4077ad6615d6f96da1588a68c1805f160d6ad0d Parents: fd43c33 27cbf55 Author: Brandon Williams Authored: Thu Aug 14 15:51:09 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 15:51:09 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkOutputFormat.java | 106 ++++++++++ .../hadoop/cql3/CqlBulkRecordWriter.java | 199 +++++++++++++++++++ 3 files changed, 306 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4077ad6/CHANGES.txt ----------------------------------------------------------------------