This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ac165325bc281364833013dd3bf5e1916fe2ac62 Merge: 8429229b7d ed07f7d6bc Author: Mick Semb Wever <[email protected]> AuthorDate: Sun Oct 23 23:25:42 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Increment versions to 3.0.29, 3.11.15, 4.0.8 CHANGES.txt | 9 +++++++-- build.xml | 2 +- debian/changelog | 6 ++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 2827115775,005d97f1fb..02048723ef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,17 +1,26 @@@ - 4.0.7 -3.11.15 ++4.0.8 + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) ++Merged from 3.11: + Merged from 3.0: + * Fix running Ant rat targets without git (CASSANDRA-17974) + + -3.11.14 ++4.0.7 + * Remove empty cq4 files in log directory to not fail the startup of BinLog (CASSANDRA-17933) + * Fix multiple BufferPool bugs (CASSANDRA-16681) + * Fix StorageService.getNativeaddress handling of IPv6 addresses (CASSANDRA-17945) + * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895) + * Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900) + * Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864) + * HintedHandoffAddRemoveNodesTest now accounts for the fact that StorageMetrics.totalHints is not updated synchronously w/ writes (CASSANDRA-16679) + * Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613) + * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834) +Merged from 3.11: * 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 0e152d2a85,b722e13074..88238c950b --- 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.0.7"/> - <property name="base.version" value="3.11.15"/> ++ <property name="base.version" value="4.0.8"/> <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 42f0e458cd,c895b9fe57..b0e7e56a49 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,10 +1,10 @@@ -cassandra (3.11.15) UNRELEASED; urgency=medium ++cassandra (4.0.8) UNRELEASED; urgency=medium + + * New release + - -- Mick Semb Wever <[email protected]> Wed, 19 Oct 2022 10:27:23 +0200 ++ -- Mick Semb Wever <[email protected]> Wed, 19 Oct 2022 10:57:06 +0200 + -cassandra (3.11.14) unstable; urgency=medium +cassandra (4.0.7) unstable; urgency=medium * New release --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
