You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/22 09:43:32 UTC

[3/6] git commit: Update changelog

Update changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64d27928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64d27928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64d27928

Branch: refs/heads/trunk
Commit: 64d279289917f806f4d5bd63dbee4207e6b0a1f2
Parents: 04e6dfb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 22 09:39:01 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 22 09:39:01 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d27928/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b77e781..e93778b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,9 @@
  * 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)
+Merged from 1.0:
+ * remove the wait on hint future during write (CASSANDRA-3870)
+
 
 1.1-beta1
  * add nodetool rebuild_index (CASSANDRA-3583)