Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89a92797 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89a92797 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89a92797 Branch: refs/heads/trunk Commit: 89a927978fd8686564789d0170af824974bf258b Parents: 4878852 8458e4e Author: Yuki Morishita <[email protected]> Authored: Tue Aug 9 16:56:35 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Aug 9 16:56:35 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Config.java | 4 ++ .../cassandra/config/DatabaseDescriptor.java | 5 -- .../cassandra/streaming/StreamReader.java | 26 +--------- .../cassandra/streaming/StreamSession.java | 36 +------------- .../compress/CompressedInputStream.java | 21 +++++++- .../compress/CompressedStreamReader.java | 10 ++-- .../streaming/messages/IncomingFileMessage.java | 22 ++------- .../streaming/messages/RetryMessage.java | 4 ++ .../org/apache/cassandra/utils/Throwables.java | 14 ++++++ .../compression/CompressedInputStreamTest.java | 52 +++++++++++++++++--- 11 files changed, 100 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a92797/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a92797/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a92797/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
