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/5d7e8c8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d7e8c8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d7e8c8a Branch: refs/heads/cassandra-2.0 Commit: 5d7e8c8aaa7012d5d2b389d8062ecb074a8c782a Parents: 6034d98 f5c9b4a Author: Yuki Morishita <yu...@apache.org> Authored: Mon Aug 26 11:41:17 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Aug 26 11:41:17 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableReader.java | 12 ++++------ .../cassandra/utils/AlwaysPresentFilter.java | 24 +++++++++----------- .../apache/cassandra/utils/FilterFactory.java | 8 ++----- .../org/apache/cassandra/utils/IFilter.java | 8 ++++--- .../cassandra/utils/Murmur3BloomFilter.java | 6 +++++ 6 files changed, 30 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d7e8c8a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d7e8c8a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ----------------------------------------------------------------------
