Updated Branches: refs/heads/trunk ccbd1d528 -> b5d07e582
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/b5d07e58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5d07e58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5d07e58 Branch: refs/heads/trunk Commit: b5d07e582f19bc11b92f8461fad07631c39d0313 Parents: ccbd1d5 38aa459 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Dec 14 21:39:55 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Dec 14 21:39:55 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/b5d07e58/CHANGES.txt ----------------------------------------------------------------------
