Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 efc57cdfe -> 6a4489df3 refs/heads/trunk 95469455e -> b7ed19059
fix compilation error Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7acd0e69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7acd0e69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7acd0e69 Branch: refs/heads/cassandra-2.2 Commit: 7acd0e69dfaef9dd1ca2950038aa6feef836c097 Parents: bdbc61f Author: Benedict Elliott Smith <[email protected]> Authored: Mon May 18 09:24:02 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon May 18 09:24:16 2015 +0100 ---------------------------------------------------------------------- .../unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7acd0e69/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index 56b15fe..5d66f97 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -776,7 +776,8 @@ public class SSTableRewriterTest extends SchemaLoader } writer.abort(); cfs.getDataTracker().unmarkCompacting(sstables); - truncateCF(); + cfs.truncateBlocking(); + SSTableDeletingTask.waitForDeletions(); validateCFS(cfs); }
