This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4dd69dc62db58a82391102ba7278786508078f09
Merge: 3edca0041c d5cea135c9
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Jan 9 14:50:31 2024 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286
CHANGES.txt | 1 +
src/java/org/apache/cassandra/locator/TokenMetadata.java | 13 ++-----------
.../org/apache/cassandra/locator/TokenMetadataTest.java | 2 +-
3 files changed, 4 insertions(+), 12 deletions(-)
diff --cc CHANGES.txt
index b1518e8320,0edb216735..66144ce1e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-4.0.12
+4.1.4
+ * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
+ * Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Fixed the inconsistency between distributedKeyspaces and
distributedAndLocalKeyspaces (CASSANDRA-18747)
+ * Internode legacy SSL storage port certificate is not hot reloaded on
update (CASSANDRA-18681)
+ * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
+ * Waiting indefinitely on ReceivedMessage response in
StreamSession#receive() can cause deadlock (CASSANDRA-18733)
+ * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
+ * Skip ColumnFamilyStore#topPartitions initialization when client or tool
mode (CASSANDRA-18697)
+Merged from 4.0:
+ * Revert unnecessary read lock acquisition when reading ring version in
TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
* Support max SSTable size in sorted CQLSSTableWriter (CASSANDRA-18941)
* Fix nodetool repair_admin summarize-pending command to not throw exception
(CASSANDRA-19014)
* Fix cassandra-stress in simplenative mode with prepared statements
(CASSANDRA-18744)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
