Updated Branches: refs/heads/cassandra-1.2 800b4f1f6 -> fca00acb5
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fca00acb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca00acb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca00acb Branch: refs/heads/cassandra-1.2 Commit: fca00acb50eab46f133a5a17ddafe775f60bf604 Parents: 800b4f1 620a4b7 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Dec 19 16:08:40 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Dec 19 16:08:40 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/fca00acb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca00acb/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca00acb/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java ----------------------------------------------------------------------
