cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [13/50] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 24 Feb 2012 15:49:22 GMT
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)


Mime
View raw message