Merge branch 'cassandra-3.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/fa4c1738 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa4c1738 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa4c1738 Branch: refs/heads/trunk Commit: fa4c17383a168d6eb3a84eac92d98dadcd4ba373 Parents: 440366e e8737fd Author: Yuki Morishita <yu...@apache.org> Authored: Mon Nov 23 14:00:19 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Nov 23 14:00:19 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../compress/CompressedInputStream.java | 46 ++++++++-- .../compress/CompressedStreamReader.java | 4 + .../compression/CompressedInputStreamTest.java | 88 ++++++++++++++++---- 4 files changed, 114 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa4c1738/CHANGES.txt ----------------------------------------------------------------------
