Merge branch 'cassandra-3.6' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/424b0b9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/424b0b9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/424b0b9e Branch: refs/heads/trunk Commit: 424b0b9e00a700dfdbde6f443dd974d5fbd3e8f7 Parents: ad54683 dee84cc Author: Tyler Hobbs <[email protected]> Authored: Wed May 18 15:16:12 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed May 18 15:16:12 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/marshal/AbstractType.java | 8 ++++---- src/java/org/apache/cassandra/db/marshal/ListType.java | 11 +++++++---- src/java/org/apache/cassandra/db/marshal/MapType.java | 13 ++++++++----- src/java/org/apache/cassandra/db/marshal/SetType.java | 11 +++++++---- src/java/org/apache/cassandra/db/marshal/UserType.java | 5 ++++- .../apache/cassandra/schema/LegacySchemaMigrator.java | 9 ++++++--- 7 files changed, 38 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/424b0b9e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 26c2939,a2b472a..d029c7b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,17 @@@ +3.7 +Merged from 3.0: + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: + * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) + 3.6 + * Correctly migrate schema for frozen UDTs during 2.x -> 3.x upgrades + (does not affect any released versions) (CASSANDRA-11613) * Allow server startup if JMX is configured directly (CASSANDRA-11725) * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710) * Enhanced Compaction Logging (CASSANDRA-10805)
