Merge branch 'cassandra-1.1' into trunk

matsumotory · Jul 12, 2012 · bd9ab59 · bd9ab59
2 parents 93afc35 + 1e76044
commit bd9ab59
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -45,6 +45,7 @@ Merged from 1.0:
  * allow dropping columns shadowed by not-yet-expired supercolumn or row
    tombstones in PrecompactedRow (CASSANDRA-4396)
  * fix 1.0.x node join to mixed version cluster, other nodes >= 1.1 (CASSANDRA-4195)
+ * Fix LCS splitting sstable base on uncompressed size (CASSANDRA-4419)
 
 
 1.1.2