This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 18ec9f77bc NINJA-FIX: Remove conflict markers
18ec9f77bc is described below
commit 18ec9f77bca3ca4f72f2e51b4ab1680e448bfd4b
Author: Benjamin Lerer <[email protected]>
AuthorDate: Tue Jun 11 18:37:04 2024 +0200
NINJA-FIX: Remove conflict markers
---
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 72b18f6237..f762f1e81b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
5.1
* Relax slow_query_log_timeout for MultiNodeSAITest (CASSANDRA-19693)
* Audit Log entries are missing identity for mTLS connections
(CASSANDRA-19669)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
