This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2101ce947e6a8fa641d03ff6aa7f1f88fc89b0dc
Merge: 22d74c7116 71b79cfbe3
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon May 29 13:47:01 2023 +0200
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
Increment version to 4.0.11 and 4.1.3
CHANGES.txt | 5 +++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 302ac8b936,1923eb004c..d477b7fbca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,8 +1,16 @@@
-4.0.11
++4.1.3
++Merged from 4.0:
+ Merged from 3.11:
+ Merged from 3.0:
+
-4.0.10
+4.1.2
+ * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124)
+ * Return snapshots with dots in their name in nodetool listsnapshots
(CASSANDRA-18371)
+ * Fix NPE when loading snapshots and data directory is one directory from
root (CASSANDRA-18359)
+ * Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
+ * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
+ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
+Merged from 4.0:
* Improve nodetool enable{audit,fullquery}log (CASSANDRA-18550)
* Report network cache info in nodetool (CASSANDRa-18400)
* Partial compaction can resurrect deleted data (CASSANDRA-18507)
diff --cc build.xml
index 6dcc224e8f,f9dc014f26..e56c1f8e8a
--- a/build.xml
+++ b/build.xml
@@@ -33,7 -33,7 +33,7 @@@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="4.1.2"/>
- <property name="base.version" value="4.0.11"/>
++ <property name="base.version" value="4.1.3"/>
<property name="scm.connection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.developerConnection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url"
value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --cc debian/changelog
index 2363ea96f2,937aa6501c..1bb1d0da29
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
-cassandra (4.0.11) UNRELEASED; urgency=medium
++cassandra (4.1.3) UNRELEASED; urgency=medium
+
+ * New release
+
- -- Mick Semb Wever <m...@apache.org> Thu, 25 May 2023 14:44:07 +0200
++ -- Mick Semb Wever <m...@apache.org> Thu, 25 May 2023 16:11:28 +0200
+
-cassandra (4.0.10) unstable; urgency=medium
+cassandra (4.1.2) unstable; urgency=medium
* New release
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
