merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1166262 13f79535-47bb-0310-9956-ffa450edef68
segfault · Sep 7, 2011 · 7d05f0a · 7d05f0a
1 parent c2347fa
commit 7d05f0a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -236,7 +236,6 @@
  * add DROP INDEX support to CLI (CASSANDRA-2616)
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
  * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
- * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
  * Don't write CounterUpdateColumn to disk in tests (CASSANDRA-2650)
  * Add sstable bulk loading utility (CASSANDRA-1278)
  * avoid replaying hints to dropped columnfamilies (CASSANDRA-2685)