Updated Branches: refs/heads/cassandra-1.2 90d2f8e8e -> a878a02fb refs/heads/cassandra-1.2.0 228d1cf6e -> 901a54a6d refs/heads/trunk 1650ae8f6 -> 49db94437
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49db9443 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49db9443 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49db9443 Branch: refs/heads/trunk Commit: 49db94437005495367b3c28a5c98411f8fd19a9a Parents: 1650ae8 a878a02 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 13 16:18:58 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 13 16:18:58 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/net/OutboundTcpConnectionPool.java | 2 +- .../cassandra/streaming/AbstractStreamSession.java | 20 ++--- .../apache/cassandra/streaming/FileStreamTask.java | 4 +- .../cassandra/streaming/IncomingStreamReader.java | 9 +- .../apache/cassandra/streaming/StreamHeader.java | 54 +++-------- .../cassandra/streaming/StreamInSession.java | 70 +++++---------- .../cassandra/streaming/StreamOutSession.java | 53 ++++------- .../apache/cassandra/streaming/StreamReply.java | 10 ++- .../streaming/StreamReplyVerbHandler.java | 2 +- .../apache/cassandra/streaming/StreamRequest.java | 21 +++-- .../serialization/1.2/streaming.StreamHeader.bin | Bin 175902 -> 175917 bytes .../serialization/1.2/streaming.StreamReply.bin | Bin 73 -> 89 bytes .../1.2/streaming.StreamRequestMessage.bin | Bin 7167 -> 7215 bytes .../cassandra/streaming/SerializationsTest.java | 27 +++--- .../cassandra/streaming/StreamingTransferTest.java | 6 +- 16 files changed, 106 insertions(+), 173 deletions(-) ----------------------------------------------------------------------
