Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a4e707a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a4e707a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a4e707a Branch: refs/heads/trunk Commit: 4a4e707ae3c70ab16496352c764168ab032c2fd1 Parents: 29376ff d3c5dbd Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 26 10:54:56 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 26 10:54:56 2012 -0500 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 2 +- .../org/apache/cassandra/utils/MerkleTree.java | 1 + .../serialization/1.0/db.RangeSliceCommand.bin | Bin 0 -> 777 bytes test/data/serialization/1.0/db.Row.bin | Bin 0 -> 495 bytes test/data/serialization/1.0/db.RowMutation.bin | Bin 0 -> 3266 bytes .../1.0/db.SliceByNamesReadCommand.bin | Bin 0 -> 367 bytes .../serialization/1.0/db.SliceFromReadCommand.bin | Bin 0 -> 361 bytes test/data/serialization/1.0/db.Truncation.bin | Bin 0 -> 257 bytes test/data/serialization/1.0/db.WriteResponse.bin | Bin 0 -> 38 bytes .../serialization/1.0/db.migration.Keyspace1.bin | 1 + .../serialization/1.0/db.migration.Keyspace2.bin | 1 + .../serialization/1.0/db.migration.Keyspace3.bin | 1 + .../serialization/1.0/db.migration.Keyspace4.bin | 1 + .../serialization/1.0/db.migration.Keyspace5.bin | 1 + test/data/serialization/1.0/gms.EndpointState.bin | Bin 0 -> 73 bytes test/data/serialization/1.0/gms.Gossip.bin | Bin 0 -> 110 bytes .../data/serialization/1.0/service.TreeRequest.bin | Bin 0 -> 121 bytes .../serialization/1.0/service.TreeResponse.bin | Bin 0 -> 930 bytes .../serialization/1.0/streaming.PendingFile.bin | Bin 0 -> 3436 bytes .../serialization/1.0/streaming.StreamHeader.bin | Bin 0 -> 174421 bytes .../serialization/1.0/streaming.StreamReply.bin | Bin 0 -> 73 bytes .../1.0/streaming.StreamRequestMessage.bin | Bin 0 -> 7087 bytes test/data/serialization/1.0/utils.BloomFilter.bin | Bin 0 -> 2500016 bytes .../serialization/1.0/utils.EstimatedHistogram.bin | Bin 0 -> 97500 bytes .../serialization/1.0/utils.LegacyBloomFilter.bin | Bin 0 -> 5000170 bytes .../cassandra/AbstractSerializationsTester.java | 6 +++- .../apache/cassandra/net/MessageSerializer.java | 1 - .../cassandra/service/SerializationsTest.java | 20 +++++++++------ .../apache/cassandra/utils/SerializationsTest.java | 7 +++-- 29 files changed, 27 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
