Updated Branches: refs/heads/trunk 7f747c9d9 -> ca216f771
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca216f77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca216f77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca216f77 Branch: refs/heads/trunk Commit: ca216f7717968ec2f7f1d11d64975e838d8d5da0 Parents: c66f439 7f747c9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Dec 28 11:51:24 2011 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Dec 28 11:51:24 2011 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../io/compress/CompressedRandomAccessReader.java | 14 +++-- .../io/compress/CompressionParameters.java | 43 +++++++++------ 3 files changed, 37 insertions(+), 23 deletions(-) ----------------------------------------------------------------------