Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/617bd23e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/617bd23e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/617bd23e Branch: refs/heads/cassandra-3.X Commit: 617bd23e8b55a190774db7053d85f6067aedd8ba Parents: b0f85b9 e4f7325 Author: T Jake Luciani <[email protected]> Authored: Tue Jan 3 12:55:53 2017 -0500 Committer: T Jake Luciani <[email protected]> Committed: Tue Jan 3 12:55:53 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 +--- .../apache/cassandra/locator/DynamicEndpointSnitchTest.java | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/617bd23e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 528ed65,d31ffc8..36c88c9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ -2.2.9 +3.0.11 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * CQL often queries static columns unnecessarily (CASSANDRA-12768) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/617bd23e/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java ----------------------------------------------------------------------
