This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 40319901e9fb67eeff1c0a89297db2021200f0ba
Merge: 061cb88b3c 36a1ca5e48
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Mar 19 14:57:58 2024 +0100
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/db/virtual/SettingsTable.java | 14 ++++++++++++--
.../cassandra/db/virtual/SettingsTableTest.java | 20 ++++++++++----------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --cc CHANGES.txt
index 7bd2710ddf,a56ec17d01..c1b07e384f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -50,8 -25,9 +50,9 @@@ Merged from 5.0
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
+ * Fix system_views.settings to handle array types (CASSANDRA-19475)
- * 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)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
* Push LocalSessions info logs to debug (CASSANDRA-18335)
* Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
