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 cf71b602e61519477a60e4f0f4fac98bdb0af190 Merge: 2c0371a311 2482c8a936 Author: Stefan Miklosovic <[email protected]> AuthorDate: Fri Feb 23 14:52:57 2024 +0100 Merge branch 'cassandra-5.0' into trunk .build/cassandra-deps-template.xml | 2 +- .build/parent-pom-template.xml | 2 +- CHANGES.txt | 1 + build.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 03c3fd2840,d02922f756..8460e99058 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -44,8 -24,12 +44,9 @@@ Merged from 4.0 * Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412) * Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416) * Add new concurrent_merkle_tree_requests config property to prevent OOM during multi-range and/or multi-table repairs (CASSANDRA-19336) - * Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187) - * Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999) - * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107) Merged from 3.11: Merged from 3.0: + * Fix SCM URL link (CASSANDRA-19422) * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) diff --cc build.xml index a4395d4ff5,bb4355b413..11b7254a14 --- a/build.xml +++ b/build.xml @@@ -33,10 -33,10 +33,10 @@@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="5.0-beta2"/> + <property name="base.version" value="5.1"/> <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"/> + <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git"/> <!-- JDKs supported. All releases are built with the default JDK. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
