Merge branch 'cassandra-2.2' into cassandra-3.0 * cassandra-2.2: Fix CompressorTest on non-x86 environment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d354ddcf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d354ddcf Branch: refs/heads/cassandra-3.0 Commit: d354ddcfbedca0e0ed4175689260e1145ad62bae Parents: 969f797 8d5b7b6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 23 10:46:31 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 23 10:46:31 2016 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d354ddcf/test/unit/org/apache/cassandra/io/compress/CompressorTest.java ----------------------------------------------------------------------
