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/38aa459e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38aa459e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38aa459e Branch: refs/heads/trunk Commit: 38aa459efaae1a0fcef7b1796a0ceabbbf9e9241 Parents: 8e2f380 ab071c5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 14 21:38:58 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 14 21:38:58 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../io/compress/CompressionParameters.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38aa459e/CHANGES.txt ----------------------------------------------------------------------
