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/2c8100af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c8100af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c8100af Branch: refs/heads/trunk Commit: 2c8100af210990bf1f15cc6691066787b88e5f25 Parents: e80564f 0439531 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 3 14:39:45 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 3 14:39:45 2014 +0100 ---------------------------------------------------------------------- .../cassandra/io/compress/CompressedRandomAccessReaderTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
