This is an automated email from the ASF dual-hosted git repository.

maedhroz pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 14c773d8bcc3c7e1e9fe69ba7178c0914a532b91
Merge: ad642d5e25 4dd69dc62d
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Jan 9 14:59:32 2024 -0600

    Merge branch 'cassandra-4.1' into cassandra-5.0
    
    * cassandra-4.1:
      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 fa6b00a1d7,66144ce1e6..0e2306dc68
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,14 +1,42 @@@
 -4.1.4
 +5.0-beta2
 + * Creating a SASI index after creating an SAI index does not break secondary 
index queries (CASSANDRA-18939)
 + * Optionally fail when a non-partition-restricted query is issued against an 
index (CASSANDRA-18796)
 + * Add a startup check to fail startup when using invalid configuration with 
certain Kernel and FS type (CASSANDRA-19196)
 + * UCS min_sstable_size should not be lower than target_sstable_size lower 
bound (CASSANDRA-19112)
 + * Fix the correspondingMessagingVersion of SSTable format and improve TTL 
overflow tests coverage (CASSANDRA-19197)
 + * Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
 + * Suppress CVE-2023-6481 (CASSANDRA-19184)
 +Merged from 4.1:
   * 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)
 +Merged from 3.11:
 +Merged from 3.0:
 +
 +
 +5.0-beta1
 + * Fix SAI intersection queries (CASSANDRA-19011)
 + * Clone EndpointState before sending GossipShutdown message (CASSANDRA-19115)
 + * SAI indexes are marked queryable during truncation (CASSANDRA-19032)
 + * Enable Direct-IO feature for CommitLog files using Java native API's. 
(CASSANDRA-18464)
 + * SAI fixes for composite partitions, and static and non-static rows 
intersections (CASSANDRA-19034)
 + * Improve SAI IndexContext handling of indexed and non-indexed columns in 
queries (CASSANDRA-18166)
 + * Fixed bug where UnifiedCompactionTask constructor was calling the wrong 
base constructor of CompactionTask (CASSANDRA-18757)
 + * Fix SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040)
 + * Ensure that empty SAI column indexes do not fail on validation after 
full-SSTable streaming (CASSANDRA-19017)
 + * SAI in-memory index should check max term size (CASSANDRA-18926)
 + * Set default disk_access_mode to mmap_index_only (CASSANDRA-19021)
 + * Exclude net.java.dev.jna:jna dependency from dependencies of 
org.caffinitas.ohc:ohc-core (CASSANDRA-18992)
 + * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945)
 + * Make cqlsh's min required Python version 3.7+ instead of 3.6+ 
(CASSANDRA-18960)
 + * Fix incorrect seeking through the sstable iterator by IndexState 
(CASSANDRA-18932)
 + * Upgrade Python driver to 3.28.0 (CASSANDRA-18960)
 + * Add retries to IR messages (CASSANDRA-18962)
 + * Add metrics and logging to repair retries (CASSANDRA-18952)
 + * Remove deprecated code in Cassandra 1.x and 2.x (CASSANDRA-18959)
 + * ClientRequestSize metrics should not treat CONTAINS restrictions as being 
equality-based (CASSANDRA-18896)
 +Merged from 4.0:
   * 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

Reply via email to