Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a878a02f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a878a02f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a878a02f Branch: refs/heads/cassandra-1.2 Commit: a878a02fb0c9d3abbcdd854039e5075793f861aa Parents: 90d2f8e 901a54a Author: Yuki Morishita <yu...@apache.org> Authored: Tue Nov 13 16:18:27 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Nov 13 16:18:27 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a878a02f/CHANGES.txt ----------------------------------------------------------------------
