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

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2022-03-14 14:04:40 -05:00
parent bdeafa0b79 541d769042
commit d9bd03552d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@ Merged from 3.11:
* dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415)
* Validate existence of DCs when repairing (CASSANDRA-17407) * Validate existence of DCs when repairing (CASSANDRA-17407)
Merged from 3.0: Merged from 3.0:
* Require ant >= 1.10 (CASSANDRA-17428)
* Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266) * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
* Suppress inapplicable CVEs (CASSANDRA-17368) * Suppress inapplicable CVEs (CASSANDRA-17368)
* Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338) * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338)

9
build.xml
View File

@ -18,6 +18,15 @@
xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant"
xmlns:if="ant:if" xmlns:if="ant:if"
xmlns:unless="ant:unless"> xmlns:unless="ant:unless">
<fail message="You need to use Ant of version at least 1.10 to continue.">
<condition>
<not>
<antversion atleast="1.10"/>
</not>
</condition>
</fail>
<property environment="env"/> <property environment="env"/>
<property file="build.properties" /> <property file="build.properties" />
<property file="build.properties.default" /> <property file="build.properties.default" />