This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e76b63d08146a3918b8315b9f0a11a04dca66da7
Merge: 20d80118ac 07768674ac
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Sep 19 20:35:19 2023 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
debian/control | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 9b38559d7d,3f0fecbb6b..a998a12c81
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,8 -8,8 +11,9 @@@ Merged from 5.0
Merged from 4.1:
* Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466)
Merged from 4.0:
+ * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
Merged from 3.11:
+ * Revert CASSANDRA-18543 (CASSANDRA-18854)
Merged from 3.0:
* Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
