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/b2930de8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2930de8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2930de8 Branch: refs/heads/trunk Commit: b2930de806b64c7dd5f0d97fae5fa308654dbe42 Parents: a50467e 5d7e8c8 Author: Yuki Morishita <[email protected]> Authored: Mon Aug 26 11:41:23 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Aug 26 11:41:23 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/b2930de8/CHANGES.txt ----------------------------------------------------------------------
