You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/10/01 14:28:29 UTC
[cassandra] branch cassandra-3.11 updated (c6e897d -> 2614f7e)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from c6e897d Merge branch 'cassandra-3.0' into cassandra-3.11
new 0c46531 Make -Dtest.methods consistently optional in all Ant test targets
new 2614f7e Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
build.xml | 29 +++++++++++++++++++++--------
2 files changed, 22 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2614f7eeb4343b1d752a16688a1dc55ab245ca8f
Merge: c6e897d 0c46531
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Fri Oct 1 15:18:40 2021 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
build.xml | 29 +++++++++++++++++++++--------
2 files changed, 22 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index 37ec9c1,2ca4481..a40b226
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
-3.0.26:
+3.11.12
+ * Add key validation to ssstablescrub (CASSANDRA-16969)
+ * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
+ * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
+ * Fix ant-junit dependency issue (CASSANDRA-16827)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
+ * Avoid sending CDC column if not enabled (CASSANDRA-16770)
+Merged from 3.0:
+ * Make -Dtest.methods consistently optional in all Ant test targets (CASSANDRA-17014)
* Immediately apply stream throughput, considering negative values as unthrottled (CASSANDRA-16959)
* Do not release new SSTables in offline transactions (CASSANDRA-16975)
* ArrayIndexOutOfBoundsException in FunctionResource#fromName (CASSANDRA-16977, CASSANDRA-16995)
diff --cc build.xml
index 5c80b6d,c11a796..fe77098
--- a/build.xml
+++ b/build.xml
@@@ -1294,7 -1305,8 +1296,8 @@@
</antcall>
</target>
-- <!-- Use this with an FQDN for test class, and a csv list of methods like this:
++ <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+ ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest
ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest -Dtest.methods=testRegularMode,testGetAllRangesEmpty
-->
<target name="testsome" depends="build-test" description="Execute specific unit tests" >
@@@ -1309,15 -1322,22 +1313,17 @@@
</testmacro>
</target>
-- <!-- Use this with an FQDN for test class, and a csv list of methods like this:
++ <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+ ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest
ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dtest.methods=testAllocate
-->
<target name="burn-testsome" depends="build-test" description="Execute specific burn unit tests" >
<testmacro inputdir="${test.burn.src}" timeout="${test.burn.timeout}">
- <test name="${test.name}" methods="${test.methods}"/>
+ <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}"/>
+ <test if:blank="${test.methods}" name="${test.name}"/>
</testmacro>
</target>
- <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled">
- <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
- <concat destfile="${compressed_yaml}">
- <fileset file="${test.conf}/cassandra.yaml"/>
- <fileset file="${test.conf}/commitlog_compression.yaml"/>
- </concat>
+ <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled">
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
<fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
@@@ -1603,7 -1612,8 +1614,8 @@@
</testmacro>
</target>
-- <!-- Use this with an FQDN for test class, and a csv list of methods like this:
++ <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+ ant test-jvm-dtest-some -Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest
ant test-jvm-dtest-some -Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest -Dtest.methods=looperTest
-->
<target name="test-jvm-dtest-some" depends="build-test" description="Execute some in-jvm dtests">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org