Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bdf3184 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bdf3184 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bdf3184 Branch: refs/heads/trunk Commit: 5bdf3184bdcba969a67f8b5093bdc1a4657cc3c2 Parents: 0f483d8 424b0b9 Author: Tyler Hobbs <[email protected]> Authored: Wed May 18 15:16:23 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed May 18 15:16:23 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/5bdf3184/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4ace3a7,d029c7b..adadefd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,8 -9,9 +18,10 @@@ Merged from 2.2 * 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)
