You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/05/18 10:25:56 UTC
[1/4] cassandra git commit: fix compilation error
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 <be...@apache.org>
Authored: Mon May 18 09:24:02 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
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);
}
[4/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ed1905
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ed1905
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ed1905
Branch: refs/heads/trunk
Commit: b7ed19059d685233c2dd2f4bdfc9a75d43029723
Parents: 9546945 7acd0e6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon May 18 09:25:31 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon May 18 09:25:31 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/b7ed1905/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
[2/4] cassandra git commit: fix compilation error
Posted by be...@apache.org.
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/trunk
Commit: 7acd0e69dfaef9dd1ca2950038aa6feef836c097
Parents: bdbc61f
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon May 18 09:24:02 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
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);
}
[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a4489df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a4489df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a4489df
Branch: refs/heads/cassandra-2.2
Commit: 6a4489df3b8549979d517a646bc70723dd859430
Parents: efc57cd 7acd0e6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon May 18 09:25:24 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon May 18 09:25:24 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/6a4489df/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------