Merge branch 'cassandra-2.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/5746f602 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5746f602 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5746f602 Branch: refs/heads/trunk Commit: 5746f602f2bfafcc471ed11d97ca3d516932a1a2 Parents: eb60f31 6fe6c99 Author: T Jake Luciani <j...@apache.org> Authored: Wed May 27 16:22:01 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 27 16:22:01 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/io/compress/CompressionParameters.java | 2 +- test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5746f602/CHANGES.txt ----------------------------------------------------------------------
