Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: add method to get size of endpoints to TokenMetadata
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8049ae1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8049ae1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8049ae1 Branch: refs/heads/trunk Commit: d8049ae105fa37e1f8f28e8630f8a390f9a25fbb Parents: 066ba25 4901e4b Author: Dikang Gu <[email protected]> Authored: Fri Dec 9 16:18:33 2016 -0800 Committer: Dikang Gu <[email protected]> Committed: Fri Dec 9 16:19:06 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/batchlog/BatchlogManager.java | 2 +- .../org/apache/cassandra/dht/RangeStreamer.java | 2 +- .../cassandra/hints/HintsDispatchExecutor.java | 2 +- .../apache/cassandra/locator/TokenMetadata.java | 32 +++++++++++++++- .../cassandra/service/StorageService.java | 6 +-- .../cassandra/locator/TokenMetadataTest.java | 39 ++++++++++++++++++++ .../service/LeaveAndBootstrapTest.java | 4 +- .../org/apache/cassandra/service/MoveTest.java | 4 +- .../apache/cassandra/service/RemoveTest.java | 4 +- 10 files changed, 83 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8049ae1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c7db5ef,3c49a8a..567e536 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +4.0 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * 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) + + 3.12 + * add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) * Fix primary index calculation for SASI (CASSANDRA-12910) * Expose time spent waiting in thread pool queue (CASSANDRA-8398) * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8049ae1/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8049ae1/test/unit/org/apache/cassandra/service/MoveTest.java ----------------------------------------------------------------------
