Merge branch 'cassandra-3.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/db49d3b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db49d3b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db49d3b8 Branch: refs/heads/trunk Commit: db49d3b89db3ab8a37b643d7e20938ffce1fbc9c Parents: bc8e878 d4e6f08 Author: Tyler Hobbs <[email protected]> Authored: Thu Feb 11 17:54:30 2016 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Thu Feb 11 17:54:30 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/format/SSTableReader.java | 13 ++- .../cassandra/io/sstable/SSTableReaderTest.java | 113 ++++++++++++++----- 3 files changed, 93 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ----------------------------------------------------------------------
