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/aff6994c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aff6994c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aff6994c Branch: refs/heads/trunk Commit: aff6994c8fb7dbf44b6c6191d36209f349217ac3 Parents: aa898a0 5be1f66 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 17 19:31:51 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 17 19:31:51 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/aff6994c/CHANGES.txt ----------------------------------------------------------------------
