Updated Branches: refs/heads/trunk ac362dadd -> 5f1d7b06b
Merge branch '4247-3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f1d7b06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f1d7b06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f1d7b06 Branch: refs/heads/trunk Commit: 5f1d7b06be208b1685dc839794491296e068d1d2 Parents: ac362da cbd6865 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon May 21 16:00:18 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon May 21 16:00:18 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 + .../org/apache/cassandra/db/IndexScanCommand.java | 13 +- .../org/apache/cassandra/db/RangeSliceCommand.java | 142 ++++++++++++--- src/java/org/apache/cassandra/db/TypeSizes.java | 12 ++ .../org/apache/cassandra/net/MessagingService.java | 3 +- .../cassandra/service/AntiEntropyService.java | 12 -- .../apache/cassandra/streaming/PendingFile.java | 22 +-- .../apache/cassandra/streaming/StreamRequest.java | 38 ++--- .../org/apache/cassandra/utils/FBUtilities.java | 4 +- .../org/apache/cassandra/utils/MerkleTree.java | 2 +- .../serialization/1.2/db.RangeSliceCommand.bin | Bin 819 -> 701 bytes test/data/serialization/1.2/db.Row.bin | Bin 495 -> 495 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3266 -> 3266 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 73 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes .../serialization/1.2/streaming.PendingFile.bin | Bin 3466 -> 3466 bytes .../serialization/1.2/streaming.StreamHeader.bin | Bin 175486 -> 175486 bytes .../1.2/streaming.StreamRequestMessage.bin | Bin 7127 -> 7127 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes 20 files changed, 168 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f1d7b06/CHANGES.txt ----------------------------------------------------------------------
