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

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
	test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
This commit is contained in:
Tyler Hobbs 2014-11-04 12:00:14 -06:00
parent 7647804309 b3c1e147b5
commit 2d4a305c5e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
View File

@ -679,6 +679,9 @@ public class RangeTombstoneTest extends SchemaLoader
deletes.add(col);
}
@Override
public void deleteForCleanup(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) {}
public void insert(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup)
{
inserts.add(col);

3
test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java
View File

@ -193,6 +193,9 @@ public class SecondaryIndexCellSizeTest
{
}
@Override
public void deleteForCleanup(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) {}
@Override
public void insert(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup)
{