This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ed07f7d6bc3e2185997f8e0180b9643bcbf57543
Merge: 761d9f9516 a3b4119b5a
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sun Oct 23 23:19:59 2022 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
Increment versions to 3.0.29, 3.11.15, 4.0.8
CHANGES.txt | 6 +++++-
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 0fbc61ba67,bd78e9207c..005d97f1fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,8 +1,17 @@@
-3.0.29
++3.11.15
++Merged from 3.0:
+ * Fix running Ant rat targets without git (CASSANDRA-17974)
+
+
-3.0.28
+3.11.14
+ * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966)
+ * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681)
+ * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
+ * Fix potential IndexOutOfBoundsException in PagingState in mixed mode
clusters (CASSANDRA-17840)
+ * Document usage of closed token intervals in manual compaction
(CASSANDRA-17575)
+ * Creating of a keyspace on insufficient number of replicas should filter
out gosspping-only members (CASSANDRA-17759)
+ * Only use statically defined subcolumns when determining column definition
for supercolumn cell (CASSANDRA-14113)
+Merged from 3.0:
- * Fix running Ant rat targets without git (CASSANDRA-17974)
* Harden JMX by resolving beanshooter issues (CASSANDRA-17921)
* Suppress CVE-2019-2684 (CASSANDRA-17965)
* Fix auto-completing "WITH" when creating a materialized view
(CASSANDRA-17879)
diff --cc build.xml
index 5745483b28,ef684efcb9..b722e13074
--- 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="3.11.14"/>
- <property name="base.version" value="3.0.29"/>
++ <property name="base.version" value="3.11.15"/>
<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 8aa938d7e8,99743d66a5..c895b9fe57
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
-cassandra (3.0.29) UNRELEASED; urgency=medium
++cassandra (3.11.15) UNRELEASED; urgency=medium
+
+ * New release
+
- -- Mick Semb Wever <m...@apache.org> Wed, 19 Oct 2022 09:58:43 +0200
++ -- Mick Semb Wever <m...@apache.org> Wed, 19 Oct 2022 10:27:23 +0200
+
-cassandra (3.0.28) unstable; urgency=medium
+cassandra (3.11.14) unstable; urgency=medium
* New release
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
