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

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


The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
     new 7cc7e95fde Fix CHANGES
7cc7e95fde is described below

commit 7cc7e95fde1480ff2ea37b381f332581bdbcc058
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Sep 16 16:03:47 2024 -0500

    Fix CHANGES
---
 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e42d3a4abe..6d7add7b45 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -90,7 +90,6 @@ 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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to