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/060c7961 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/060c7961 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/060c7961 Branch: refs/heads/trunk Commit: 060c7961d0a8374f53312a1cf9ea4b78a0e47b9c Parents: 504d3c5 bd692ba Author: Marcus Eriksson <[email protected]> Authored: Wed Aug 20 08:25:59 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Aug 20 08:25:59 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/060c7961/CHANGES.txt ----------------------------------------------------------------------
