merge from 1.0

matsumotory · Jul 11, 2012 · 97620fe · 97620fe
2 parents 3e48582 + 51a9fd1
commit 97620fe
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -13,6 +13,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)
 
 
 1.1.2