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/3bfe4b6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bfe4b6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bfe4b6a Branch: refs/heads/trunk Commit: 3bfe4b6ae849add1c3388db3874bbdfd27443822 Parents: 774bd0b 80c5191 Author: T Jake Luciani <[email protected]> Authored: Thu Apr 30 12:42:10 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Thu Apr 30 12:42:10 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/io/compress/CompressionParameters.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bfe4b6a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bfe4b6a/src/java/org/apache/cassandra/io/compress/CompressionParameters.java ----------------------------------------------------------------------
