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 

* cassandra-3.0:
  Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0
This commit is contained in:
Sylvain Lebresne 2017-02-09 10:27:00 +01:00
parent 6b7302b659 74fdfe0a5f
commit 6a504f4030
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -6,6 +6,8 @@
* More fixes to the TokenAllocator (CASSANDRA-12990)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
Merged from 3.0:
* Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
* Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
* Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
* Fix handling of partition with partition-level deletion plus
live rows in sstabledump (CASSANDRA-13177)

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

@ -1263,7 +1263,7 @@ public abstract class LegacyLayout
return true;
}
if (tombstone.isCollectionTombstone())
if (tombstone.isCollectionTombstone() && helper.includes(tombstone.start.collectionName))
{
if (clustering == null)
{