Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d40809d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d40809d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d40809d Branch: refs/heads/trunk Commit: 6d40809d809709aefb296230c3ab7c91164640b6 Parents: 2505733 e2a0d75 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Oct 25 16:57:19 2016 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Oct 25 16:58:41 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../cassandra/dht/ByteOrderedPartitioner.java | 5 + .../org/apache/cassandra/dht/IPartitioner.java | 5 + .../apache/cassandra/dht/LocalPartitioner.java | 5 + .../cassandra/dht/Murmur3Partitioner.java | 36 +++ .../dht/OrderPreservingPartitioner.java | 5 + .../apache/cassandra/dht/RandomPartitioner.java | 37 ++- .../NoReplicationTokenAllocator.java | 266 ++++++++++++++++++ .../ReplicationAwareTokenAllocator.java | 250 +---------------- .../dht/tokenallocator/TokenAllocation.java | 2 +- .../dht/tokenallocator/TokenAllocator.java | 2 +- .../dht/tokenallocator/TokenAllocatorBase.java | 279 +++++++++++++++++++ .../tokenallocator/TokenAllocatorFactory.java | 37 +++ ...tractReplicationAwareTokenAllocatorTest.java | 175 +----------- .../NoReplicationTokenAllocatorTest.java | 249 +++++++++++++++++ .../tokenallocator/TokenAllocatorTestBase.java | 160 +++++++++++ .../apache/cassandra/dht/LengthPartitioner.java | 5 + .../cassandra/dht/Murmur3PartitionerTest.java | 23 ++ .../cassandra/dht/PartitionerTestCase.java | 32 +++ .../cassandra/dht/RandomPartitionerTest.java | 26 ++ 20 files changed, 1178 insertions(+), 425 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d40809d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c966b8,0f16a0e..fcd57c7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,13 @@@ +4.0 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) - Merged from 3.0: - * Include SSTable filename in compacting large row message (CASSANDRA-12384) ++ + 3.10 + * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777) * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419) * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803) * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
