natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Yuki Morishita 2017-01-16 10:28:40 -06:00
parent 0b489776c6 52bf7acb05
commit e63c7a0ac3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -111,6 +111,7 @@
* Restore resumable hints delivery (CASSANDRA-11960)
* Properly report LWT contention (CASSANDRA-12626)
Merged from 3.0:
* Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
* Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
* Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
* Add parent repair session id to anticompaction log message (CASSANDRA-12186)

2
src/java/org/apache/cassandra/db/UnfilteredDeserializer.java
View File

@ -645,7 +645,7 @@ public abstract class UnfilteredDeserializer
// If the new tombstone don't supersedes the currently open tombstone, we don't have anything to return, we
// just add the new tombstone (because we know tombstone is not fully shadowed, this imply the new tombstone
// simply extend after the first one and we'll deal with it later)
assert metadata.comparator.compare(tombstone.start.bound, first.stop.bound) > 0;
assert metadata.comparator.compare(tombstone.start.bound, first.stop.bound) <= 0;
openTombstones.add(tombstone);
return null;
}