Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90de8d55 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90de8d55 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90de8d55 Branch: refs/heads/trunk Commit: 90de8d554359a08dc9a336b6ad8412d9e15aace8 Parents: a6c3481 f1ea0ab Author: Sylvain Lebresne <[email protected]> Authored: Wed Nov 14 10:39:24 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Nov 14 10:39:24 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/cql3/QueryProcessor.java | 3 - .../apache/cassandra/io/sstable/SSTableLoader.java | 2 + .../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 | 72 +++++---------- .../cassandra/streaming/StreamOutSession.java | 53 ++++------- .../apache/cassandra/streaming/StreamReply.java | 10 +- .../streaming/StreamReplyVerbHandler.java | 2 +- .../apache/cassandra/streaming/StreamRequest.java | 21 ++-- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 + .../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 +- 19 files changed, 112 insertions(+), 177 deletions(-) ----------------------------------------------------------------------
