natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2024-02-23 14:51:33 +01:00
parent bfc6e1241d 95fcefede2
commit 2482c8a936
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.build/cassandra-deps-template.xml
View File

@ -37,7 +37,7 @@
<scm> <scm>
<connection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</connection> <connection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</connection>
<developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection> <developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree</url> <url>https://gitbox.apache.org/repos/asf?p=cassandra.git</url>
</scm> </scm>
<dependencies> <dependencies>
<dependency> <dependency>

2
.build/parent-pom-template.xml
View File

@ -241,7 +241,7 @@
<scm> <scm>
<connection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</connection> <connection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</connection>
<developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection> <developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree</url> <url>https://gitbox.apache.org/repos/asf?p=cassandra.git</url>
</scm> </scm>
<profiles> <profiles>

1
CHANGES.txt
View File

@ -29,6 +29,7 @@ Merged from 4.0:
* Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107) * Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
Merged from 3.11: Merged from 3.11:
Merged from 3.0: Merged from 3.0:
* Fix SCM URL link (CASSANDRA-19422)
* Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824)

2
build.xml
View File

@ -36,7 +36,7 @@
<property name="base.version" value="5.0-beta2"/> <property name="base.version" value="5.0-beta2"/>
<property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/> <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.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. <!-- JDKs supported.
All releases are built with the default JDK. All releases are built with the default JDK.