Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2b26e5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b26e5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b26e5c Branch: refs/heads/trunk Commit: c2b26e5c696cb28f16639baedc4085e1b01f5932 Parents: 36280a0 cd714a1 Author: T Jake Luciani <[email protected]> Authored: Fri Dec 12 09:15:09 2014 -0500 Committer: T Jake Luciani <[email protected]> Committed: Fri Dec 12 09:15:09 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/compress/CompressionParameters.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b26e5c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b26e5c/src/java/org/apache/cassandra/io/compress/CompressionParameters.java ----------------------------------------------------------------------
