Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8737fda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8737fda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8737fda Branch: refs/heads/trunk Commit: e8737fda3aea7ac28fe04c02fa687d2606b8d6c8 Parents: e0c9452 0b3cfae Author: Yuki Morishita <yu...@apache.org> Authored: Mon Nov 23 13:59:04 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Nov 23 13:59:04 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/e8737fda/CHANGES.txt ----------------------------------------------------------------------
