Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68f7ce44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68f7ce44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68f7ce44 Branch: refs/heads/cassandra-3.11 Commit: 68f7ce440e3ddf1dc67a508bbc1fb8db4a60a027 Parents: 84b1725 617bd23 Author: T Jake Luciani <j...@apache.org> Authored: Tue Jan 3 13:03:49 2017 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Jan 3 13:03:49 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 +--- .../apache/cassandra/locator/DynamicEndpointSnitchTest.java | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68f7ce44/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c215a2,36c88c9..64314dc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -127,12 -16,31 +127,14 @@@ Merged from 3.0 * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) * Reenable HeapPool (CASSANDRA-12900) -Merged from 2.2: - * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) - * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) - * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) - * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) - * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) - * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673) - * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) - * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) - * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) - * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) -Merged from 2.1: - * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) - - -3.0.10 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039) + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283) * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889) - * Fix partition count log during compaction (CASSANDRA-12184) * Batch with multiple conditional updates for the same partition causes AssertionError (CASSANDRA-12867) * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788) - * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854) * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296) - * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689) + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854) + * Avoid deadlock due to MV lock contention (CASSANDRA-12689) * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801) * Include SSTable filename in compacting large row message (CASSANDRA-12384) * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330) @@@ -173,14 -67,6 +175,15 @@@ * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: ++ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) http://git-wip-us.apache.org/repos/asf/cassandra/blob/68f7ce44/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68f7ce44/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ----------------------------------------------------------------------
