This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c52ecb104cee89c94dba36a43edac93b9d4ee22c
Merge: 2c684a0f5a 2cd5515c12
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Sep 16 12:26:12 2024 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 37 ++++++++++++++++++++
.../org/apache/cassandra/utils/btree/BTree.java | 40 +++++++++++++++++-----
.../org/apache/cassandra/utils/LongBTreeTest.java | 3 ++
3 files changed, 72 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index f8e024181a,e42d3a4abe..22efd72eff
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -83,6 -7,24 +83,25 @@@ Merged from 5.0
* Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
* Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
* Add java.base/java.lang.reflect among opens for jvm11-client.options
(CASSANDRA-19780)
+ Merged from 4.1:
+ Merged from 4.0:
+ * Fix memory leak in BTree.FastBuilder (CASSANDRA-19785)
+ * Fix millisecond and microsecond precision for commit log replay
(CASSANDRA-19448)
+ * Improve accuracy of memtable heap usage tracking (CASSANDRA-17298)
+ * Fix rendering UNSET collection types in query tracing (CASSANDRA-19880)
+ * Fix latency reported by ideal consistency level monitoring
(CASSANDRA-19651)
+ * Do not spam log with SSLExceptions (CASSANDRA-18839)
+
+ 5.0.0
+ 5.0-rc2
+ * Fix direct IO support always being evaluated to false upon the first start
of a node (CASSANDRA-19779)
+ * Memtable allocation type unslabbed_heap_buffers_logged will cause an
assertion error for TrieMemtables and SegmentedTrieMemtables (CASSANDRA-19835)
+ Merged from 4.0:
+ * Use default commitlog settings in test YAMLs (CASSANDRA-19830)
+
+
+ 5.0-rc1
++>>>>>>> cassandra-5.0
* Move bcpkix-jdk18on to build dependencies, update to 1.78 and explicitly
enumerate transitive dependencies (CASSANDRA-19739)
* Avoid streams in the common case for UpdateTransaction creation
(CASSANDRA-19675)
* Only wait until native_transport_timeout for dispatcher to finish
(CASSANDRA-19697)
@@@ -131,7 -73,26 +150,25 @@@ Merged from 4.1
* Refresh stale paxos commit (CASSANDRA-19617)
* Reduce info logging from automatic paxos repair (CASSANDRA-19445)
* Support legacy plain_text_auth section in credentials file removed
unintentionally (CASSANDRA-19498)
+ Merged from 4.0:
+ * Fix millisecond and microsecond precision for commit log replay
(CASSANDRA-19448)
+ * Improve accuracy of memtable heap usage tracking (CASSANDRA-17298)
+ * Fix rendering UNSET collection types in query tracing (CASSANDRA-19880)
+ * Fix latency reported by ideal consistency level monitoring
(CASSANDRA-19651)
+ * Use default commitlog settings in test YAMLs (CASSANDRA-19830)
+ * Do not spam log with SSLExceptions (CASSANDRA-18839)
+ * Fix schema.cql created by a snapshot after dropping more than one column
(CASSANDRA-19747)
+ * UnsupportedOperationException when reducing scope for LCS compactions
(CASSANDRA-19704)
+ * Make LWT conditions behavior on frozen and non-frozen columns consistent
for null column values (CASSANDRA-19637)
+ * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439)
+ * Bring Redhat packge dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
+ Merged from 3.0:
+ * Upgrade OWASP to 10.0.0 (CASSANDRA-19738)
+
+
+ 4.1.5
+ >>>>>>> cassandra-4.1
* Make queries visible to the "system_views.queries" virtual table at the
coordinator level (CASSANDRA-19577)
- * Concurrent equivalent schema updates lead to unresolved disagreement
(CASSANDRA-19578)
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
