Updated Branches: refs/heads/trunk 4a3794b7b -> d3cd9adf9
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/d3cd9adf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3cd9adf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3cd9adf Branch: refs/heads/trunk Commit: d3cd9adf99129e74d0454f237101009eba625e63 Parents: 4a3794b fca00ac Author: Aleksey Yeschenko <[email protected]> Authored: Wed Dec 19 16:10:21 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Dec 19 16:10:21 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 14 ++++ .../cassandra/db/ColumnFamilyStoreMBean.java | 5 ++ .../io/compress/CompressedRandomAccessReader.java | 2 +- .../io/compress/CompressionParameters.java | 54 ++++++++++++-- .../streaming/compress/CompressedInputStream.java | 2 +- 6 files changed, 69 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3cd9adf/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3cd9adf/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
