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/21d4a963 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21d4a963 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21d4a963 Branch: refs/heads/trunk Commit: 21d4a963d0ca62563ca19e00d47d383aec9faa71 Parents: 55b6e8a 967a2cf Author: Benedict Elliott Smith <[email protected]> Authored: Thu Sep 10 13:55:40 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Sep 10 13:55:40 2015 +0100 ---------------------------------------------------------------------- .../cassandra/hints/ChecksummedDataInput.java | 2 +- .../compress/CompressedRandomAccessReader.java | 30 +++---- .../cassandra/io/util/RandomAccessReader.java | 91 +++++++++----------- .../cassandra/utils/memory/BufferPool.java | 2 +- 4 files changed, 56 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
