cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 04 Apr 2014 20:39:41 GMT
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/64bc4584
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64bc4584
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64bc4584

Branch: refs/heads/trunk
Commit: 64bc45849fd2a488b766ca9ddfe8456dae50a187
Parents: 0015f37 5ebadc1
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Fri Apr 4 15:37:58 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Fri Apr 4 15:37:58 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/DataTracker.java    |  28 +-
 .../cassandra/io/sstable/IndexSummary.java      |   2 +-
 .../io/sstable/IndexSummaryManager.java         |  22 +-
 .../cassandra/io/sstable/SSTableReader.java     | 318 +++++++++++++------
 .../cassandra/utils/AlwaysPresentFilter.java    |   3 +-
 .../org/apache/cassandra/utils/BloomFilter.java |   3 +-
 .../org/apache/cassandra/utils/IFilter.java     |   2 +
 .../org/apache/cassandra/utils/obs/IBitSet.java |   2 +
 .../cassandra/utils/obs/OffHeapBitSet.java      |   2 +-
 .../apache/cassandra/utils/obs/OpenBitSet.java  |   2 +-
 .../io/sstable/IndexSummaryManagerTest.java     |   2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |  28 +-
 13 files changed, 278 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64bc4584/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/64bc4584/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------


Mime
View raw message