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/5be1f663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5be1f663 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5be1f663 Branch: refs/heads/trunk Commit: 5be1f663b62288043c112dbf82319bf0a63fc689 Parents: 3851d1c 5cc02dd Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 17 19:31:44 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 17 19:31:44 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/compress/CompressionMetadata.java | 30 +++++++++++ .../streaming/messages/FileMessageHeader.java | 55 ++++++++++++++++++-- .../streaming/messages/IncomingFileMessage.java | 2 +- .../streaming/messages/OutgoingFileMessage.java | 14 ++--- .../compression/CompressedInputStreamTest.java | 7 +++ 6 files changed, 93 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5be1f663/CHANGES.txt ----------------------------------------------------------------------
