Skip to content

Commit

Permalink
Merge branch 'cassandra-3.0' into cassandra-3.11
Browse files Browse the repository at this point in the history
* cassandra-3.0:
  Legacy deserializer can create unexpected boundary range tombstones
  • Loading branch information
Sylvain Lebresne committed Feb 23, 2017
2 parents 6487876 + ab71748 commit 1dc1aa1
Show file tree
Hide file tree
Showing 6 changed files with 432 additions and 170 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* More fixes to the TokenAllocator (CASSANDRA-12990)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
Merged from 3.0:
* Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
* Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
* Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
* Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
Expand Down
Loading

0 comments on commit 1dc1aa1

Please sign in to comment.