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 8af0e390be83f47ea8c4353b3b91d53331498365
Merge: e3be0df784 7cc7e95fde
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Sep 16 16:03:56 2024 -0500
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 2 --
1 file changed, 2 deletions(-)
diff --cc CHANGES.txt
index 22efd72eff,6d7add7b45..b36aeb06ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -167,8 -90,8 +166,7 @@@ Merged from 3.0
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
