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/87b0b36c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87b0b36c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87b0b36c Branch: refs/heads/trunk Commit: 87b0b36c755d6d12522c8860e8d442edafdc80a1 Parents: b3ffdf8 699eff0 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jan 11 07:59:48 2017 +0100 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jan 11 07:59:48 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b0b36c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d0c4960,917eb5d..3ed8e15 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,3 +1,14 @@@ +4.0 + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-11115) + * 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) - * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + + 3.12 * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) @@@ -29,9 -17,8 +28,7 @@@ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) * Add support for arithmetic operators (CASSANDRA-11935) * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) - Merged from 3.0: - * Remove support for non-JavaScript UDFs (CASSANDRA-12883) - 3.10 * Fixed query monitoring for range queries (CASSANDRA-13050) * Remove outboundBindAny configuration property (CASSANDRA-12673) @@@ -142,9 -129,10 +139,10 @@@ * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) * 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)