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 ea801625f64bdebf78cf03634e30a1fde037f965 Merge: 662ce36a7b bf8870f763 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Thu Sep 26 22:56:15 2024 +0200 Merge branch 'cassandra-4.0' into cassandra-4.1 * cassandra-4.0: increment version to 4.0.15 and 4.1.8 CHANGES.txt | 6 +++++- build.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index f6bb4ea904,7bdcda5023..74105a5f05 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,10 +1,12 @@@ - 4.1.7 -4.0.15 ++4.1.8 +Merged from 4.0: * Fix text containing "/*" being interpreted as multiline comment in cqlsh (CASSANDRA-17667) * Fix indexing of a frozen collection that is the clustering key and reversed (CASSANDRA-19889) * Emit error when altering a table with non-frozen UDTs with nested non-frozen collections the same way as done upon table creation (CASSANDRA-19925) + + -4.0.14 ++4.1.7 ++Merged from 4.0: * Safer handling of out-of-range tokens (CASSANDRA-13704) * Fix memory leak in BTree.FastBuilder (CASSANDRA-19785) * Fix millisecond and microsecond precision for commit log replay (CASSANDRA-19448) diff --cc build.xml index 84bb68e1ef,58e28aebce..a66f01222e --- a/build.xml +++ b/build.xml @@@ -34,7 -34,7 +34,7 @@@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="4.1.7"/> - <property name="base.version" value="4.0.15"/> ++ <property name="base.version" value="4.1.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"/> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org