This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d2d6afb8e928755b3ddcb06e0d3b254fa858fec9
Merge: 523424b9ff 1c70149ef5
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Mon Jul 25 10:15:30 2022 -0400
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 4 ++++
NEWS.txt | 1 +
conf/cassandra.yaml | 2 +-
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
src/java/org/apache/cassandra/service/StartupChecks.java | 2 +-
src/java/org/apache/cassandra/service/paxos/Paxos.java | 1 +
.../distributed/test/SSTableIdGenerationTest.java | 2 +-
.../org/apache/cassandra/service/StorageProxyTest.java | 14 ++++++++++++++
9 files changed, 25 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index d0190865ea,daea0c35ba..33753cb531
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,27 @@@
-4.1-alpha2
+4.2
+ * Add guardrail to disallow DROP KEYSPACE commands (CASSANDRA-17767)
+ * Remove ephemeral snapshot marker file and introduce a flag to
SnapshotManifest (CASSANDRA-16911)
+ * Add a virtual table that exposes currently running queries
(CASSANDRA-15241)
+ * Allow sstableloader to specify table without relying on path
(CASSANDRA-16584)
+ * Fix
TestGossipingPropertyFileSnitch.test_prefer_local_reconnect_on_listen_address
(CASSANDRA-17700)
+ * Add ByteComparable API (CASSANDRA-6936)
+ * Add guardrail for maximum replication factor (CASSANDRA-17500)
+ * Increment CQLSH to version 6.2.0 for release 4.2 (CASSANDRA-17646)
+ * Adding support to perform certificate based internode authentication
(CASSANDRA-17661)
+ * Option to disable CDC writes of repaired data (CASSANDRA-17666)
+ * When a node is bootstrapping it gets the whole gossip state but applies in
random order causing some cases where StorageService will fail causing an
instance to not show up in TokenMetadata (CASSANDRA-17676)
+ * Add CQLSH command SHOW REPLICAS (CASSANDRA-17577)
+ * Add guardrail to allow disabling of SimpleStrategy (CASSANDRA-17647)
+ * Change default directory permission to 750 in packaging (CASSANDRA-17470)
+ * Adding support for TLS client authentication for internode communication
(CASSANDRA-17513)
+ * Add new CQL function maxWritetime (CASSANDRA-17425)
+ * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations
(CASSANDRA-17495)
+ * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
+Merged from 4.1:
+ * Fix Settings Virtual Table to update paxos_variant after startup and
rename enable_uuid_sstable_identifiers to
+ uuid_sstable_identifiers_enabled as per our config naming conventions
(CASSANDRA-17738)
+ * index_summary_resize_interval_in_minutes = -1 is equivalent to
index_summary_resize_interval being set to null or
+ disabled. JMX MBean IndexSummaryManager, setResizeIntervalInMinutes method
still takes resizeIntervalInMinutes = -1 for disabled (CASSANDRA-17735)
* min_tracked_partition_size_bytes parameter from 4.1 alpha1 was renamed to
min_tracked_partition_size (CASSANDRA-17733)
* Remove commons-lang dependency during build runtime (CASSANDRA-17724)
* Relax synchronization on StreamSession#onError() to avoid deadlock
(CASSANDRA-17706)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
