update because of the merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c117634 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c117634 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c117634 Branch: refs/heads/cassandra-1.1 Commit: 9c117634ecfadf1a81c803d784d87ef027e8fc12 Parents: 6dfad41 Author: Vijay Parthasarathy <[email protected]> Authored: Fri Feb 17 15:04:26 2012 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Fri Feb 17 15:04:26 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c117634/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4bd5a0c..a1a9a32 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ 1.1-dev * avoid unproductive deserializing of cached rows during compaction (CASSANDRA-3921) - + * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412) 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) @@ -82,7 +82,6 @@ * Avoid NPE on aboarted stream-out sessions (CASSANDRA-3904) * BulkRecordWriter throws NPE for counter columns (CASSANDRA-3906) * Support compression using BulkWriter (CASSANDRA-3907) - * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412) 1.0.8 * fix race between cleanup and flush on secondary index CFSes (CASSANDRA-3712)
