You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2013/08/22 04:33:52 UTC
[1/3] git commit: Fix for missing filter type in 2.0 branch
Updated Branches:
refs/heads/trunk 74492ef27 -> 2029fb2dc
Fix for missing filter type in 2.0 branch
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5774ecb4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5774ecb4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5774ecb4
Branch: refs/heads/trunk
Commit: 5774ecb4056fc70c52c23ed923a10d01d5fecf59
Parents: ed6a5b9
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Wed Aug 21 19:32:26 2013 -0700
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Wed Aug 21 19:32:26 2013 -0700
----------------------------------------------------------------------
test/unit/org/apache/cassandra/utils/BloomFilterTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5774ecb4/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
index 872cb05..feff193 100644
--- a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
+++ b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java
@@ -38,7 +38,6 @@ import org.junit.Test;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.utils.FilterFactory.Type;
public class BloomFilterTest
{
@@ -170,7 +169,7 @@ public class BloomFilterTest
out.close();
DataInputStream in = new DataInputStream(new FileInputStream(file));
- BloomFilter filter2 = (BloomFilter) FilterFactory.deserialize(in, Type.MURMUR3, true);
+ BloomFilter filter2 = (BloomFilter) FilterFactory.deserialize(in, true);
Assert.assertTrue(filter2.isPresent(test));
FileUtils.closeQuietly(in);
}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by vi...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2029fb2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2029fb2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2029fb2d
Branch: refs/heads/trunk
Commit: 2029fb2dca83b7046d490c06ff94964a344023b7
Parents: 74492ef 1af59e3
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Wed Aug 21 19:33:40 2013 -0700
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Wed Aug 21 19:33:40 2013 -0700
----------------------------------------------------------------------
test/unit/org/apache/cassandra/utils/BloomFilterTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by vi...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1af59e39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1af59e39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1af59e39
Branch: refs/heads/trunk
Commit: 1af59e39e2525420d65012eb4cbf2552f1646075
Parents: 7b9ae6a 5774ecb
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Wed Aug 21 19:33:18 2013 -0700
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Wed Aug 21 19:33:18 2013 -0700
----------------------------------------------------------------------
test/unit/org/apache/cassandra/utils/BloomFilterTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------