This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fcf293a61a642281c8a4efe57ed08a55199fa515
Merge: 872751a ad9b715
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Nov 18 13:27:03 2020 +0100
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
NEWS.txt | 12 ++++++++++++
src/java/org/apache/cassandra/index/sasi/conf/IndexMode.java | 8 +++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 69ccf55,e16f3e5..29100fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
-3.11.10
+4.0-beta4
+ * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems
(CASSANDRA-16212)
+ * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
+ * Ensure that CacheMetrics.requests is picked up by the metric reporter
(CASSANDRA-16228)
+ * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
+ * Produce consistent tombstone for reads to avoid digest mistmatch
(CASSANDRA-15369)
+ * Fix SSTableloader issue when restoring a table named backups
(CASSANDRA-16235)
+ * Invalid serialized size for responses caused by increasing message time by
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
+ * Throw BufferOverflowException from DataOutputBuffer for better visibility
(CASSANDRA-16214)
+ * TLS connections to the storage port on a node without server encryption
configured causes java.io.IOException accessing missing keystore
(CASSANDRA-16144)
+Merged from 3.11:
+ * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to
default of 1GB (CASSANDRA-16071)
Merged from 3.0:
* Improved check of num_tokens against the length of initial_token
(CASSANDRA-14477)
* Fix a race condition on ColumnFamilyStore and TableMetrics
(CASSANDRA-16228)
diff --cc NEWS.txt
index 99c8af4,3af2150..498fbbb
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -259,27 -49,29 +259,39 @@@ Upgradin
- In cassandra.yaml, when using vnodes num_tokens must be defined if
initial_token is defined.
If it is not defined, or not equal to the numbers of tokens defined in
initial_tokens,
the node will not start. See CASSANDRA-14477 for details.
- - SASI's `max_compaction_flush_memory_in_mb` setting was previously
getting interpreted in bytes. From 3.11.8
- it is correctly interpreted in megabytes, but prior to 3.11.10 previous
configurations of this setting will
- lead to nodes OOM during compaction. From 3.11.10 previous
configurations will be detected as incorrect,
- logged, and the setting reverted to the default value of 1GB. It is up
to the user to correct the setting
- after an upgrade, via dropping and recreating the index. See
CASSANDRA-16071 for details.
-3.11.9
-======
-Upgrading
----------
- - Custom compaction strategies must handle getting sstables added/removed
notifications for
- sstables already added/removed - see CASSANDRA-14103 for details. This
has been a requirement
- for correct operation since 3.11.0 due to an issue in
CompactionStrategyManager.
-3.11.7
+Deprecation
+-----------
+
+ - The JMX MBean org.apache.cassandra.db:type=BlacklistedDirectories has
been
+ deprecated in favor of
org.apache.cassandra.db:type=DisallowedDirectories
+ and will be removed in a subsequent major version.
+
+
+Materialized Views
+-------------------
+ - Following a discussion regarding concerns about the design and safety
of Materialized Views, the C* development
+ community no longer recommends them for production use, and considers
them experimental. Warnings messages will
+ now be logged when they are created. (See
https://www.mail-archive.com/dev@cassandra.apache.org/msg11511.html)
+ - An 'enable_materialized_views' flag has been added to cassandra.yaml to
allow operators to prevent creation of
+ views
+ - CREATE MATERIALIZED VIEW syntax has become stricter. Partition key
columns are no longer implicitly considered
+ to be NOT NULL, and no base primary key columns get automatically
included in view definition. You have to
+ specify them explicitly now.
+
++3.11.10
+ ======
+
+ Upgrading
+ ---------
- - Nothing specific to this release, but please see previous upgrading
sections,
- especially if you are upgrading from 3.0.
++ - SASI's `max_compaction_flush_memory_in_mb` setting was previously
getting interpreted in bytes. From 3.11.8
++ it is correctly interpreted in megabytes, but prior to 3.11.10 previous
configurations of this setting will
++ lead to nodes OOM during compaction. From 3.11.10 previous
configurations will be detected as incorrect,
++ logged, and the setting reverted to the default value of 1GB. It is up
to the user to correct the setting
++ after an upgrade, via dropping and recreating the index. See
CASSANDRA-16071 for details.
+
+
3.11.6
======
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
