Return-Path: 
 <commits-return-50018-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
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 034119755
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri, 24 Feb 2012 15:50:10 +0000 (UTC)
Received: (qmail 4574 invoked by uid 500); 24 Feb 2012 15:50:09 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 4550 invoked by uid 500); 24 Feb 2012 15:50:09 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 4538 invoked by uid 99); 24 Feb 2012 15:50:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:50:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2012 15:50:05 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E90B5812CD1; Fri, 24 Feb 2012 15:49:22 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: slebresne@apache.org
To: commits@cassandra.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [13/50] git commit: Merge branch 'cassandra-1.1' into trunk
Message-Id: <20120224154922.E90B5812CD1@tyr.zones.apache.org>
Date: Fri, 24 Feb 2012 15:49:22 +0000 (UTC)
X-Virus-Checked: Checked by ClamAV on apache.org

Merge branch 'cassandra-1.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/590661fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590661fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590661fa

Branch: refs/heads/cassandra-1.1
Commit: 590661faf23764732aac919baeb350f4d6594299
Parents: 130b865 a47d4cb
Author: Chris Goffinet <cg@chrisgoffinet.com>
Authored: Wed Feb 22 00:02:30 2012 -0800
Committer: Chris Goffinet <cg@chrisgoffinet.com>
Committed: Wed Feb 22 00:02:30 2012 -0800

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/hadoop/BulkRecordWriter.java  |   17 ++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/590661fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 46e009f,842b603..d7e5e3f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,8 -4,8 +4,9 @@@
   * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903)
   * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
   * Update ORDER BY syntax for CQL3 (CASSANDRA-3925)
+  * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944)
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)