This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 103e9cca1abecccc66905188d5ac0137f785b22b
Merge: 6b13426562 f12f928dee
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon May 6 08:35:07 2024 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 5 +++++
redhat/cassandra.spec | 7 ++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index 4c7d59183e,a506c9e9e0..0095e2d078
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,15 @@@
-4.0.14
++4.1.6
++Merged from 4.0:
+ * Bring Redhat packge dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
+
+
-4.0.13
+4.1.5
+ * 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)
+Merged from 4.0:
* Make nodetool import congruent with the documentation by not relying on
the folder structure of the imported SSTable files (CASSANDRA-19401)
* IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
