Updated Branches: refs/heads/cassandra-1.2 c176302bb -> edcc7f137 refs/heads/trunk 44b8789a7 -> c4481e207
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4481e20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4481e20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4481e20 Branch: refs/heads/trunk Commit: c4481e207c9e9d066d091ca4b182e1068bc4a414 Parents: 44b8789 edcc7f1 Author: Jonathan Ellis <[email protected]> Authored: Wed Nov 14 10:23:58 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Nov 14 10:23:58 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 6 ++- .../io/compress/CompressedRandomAccessReader.java | 27 ++++++-- .../cassandra/io/util/BufferedSegmentedFile.java | 13 +--- .../cassandra/io/util/CompressedSegmentedFile.java | 10 ++-- .../cassandra/io/util/PoolingSegmentedFile.java | 41 ++++++++++++ .../cassandra/io/util/RandomAccessReader.java | 51 +++++++++++---- .../compress/CompressedRandomAccessReaderTest.java | 4 +- .../io/util/BufferedRandomAccessFileTest.java | 6 +- 8 files changed, 116 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
