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/e80564f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e80564f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e80564f3 Branch: refs/heads/trunk Commit: e80564f398c6278f6a6a28943e06ec800d5e68f7 Parents: 7d8092b e4437bc Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Mar 3 14:27:15 2014 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 3 14:27:15 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/compress/CompressedSequentialWriter.java | 2 +- .../CompressedRandomAccessReaderTest.java | 42 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e80564f3/CHANGES.txt ----------------------------------------------------------------------