Merge branch 'cassandra-3.0' into trunk

* cassandra-3.0:
  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/233c0306
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233c0306
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233c0306

Branch: refs/heads/trunk
Commit: 233c030662e365441434dba7144684ffd5925908
Parents: 0ebc0e4 d354ddc
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Thu Jun 23 10:46:39 2016 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Thu Jun 23 10:46:39 2016 +0200

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to