merge from 1.1

matsumotory · Jul 11, 2012 · 93afc35 · 93afc35
2 parents 26aff20 + 97620fe
commit 93afc35
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -44,6 +44,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