Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd692ba7 Branch: refs/heads/cassandra-2.1 Commit: bd692ba74499428b0ee5c6defbb86966f3b30c12 Parents: 558bb72 39b8196 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Aug 20 08:25:28 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Aug 20 08:25:28 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../compress/CompressedInputStream.java | 17 +++++++++++++-- .../compress/CompressedInputStreamTest.java | 23 +++++++++++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd692ba7/CHANGES.txt ----------------------------------------------------------------------
