You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jl...@apache.org on 2022/08/26 15:46:06 UTC
[cassandra] branch trunk updated (ea44835bf1 -> 756d506bd9)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from ea44835bf1 Mark antora.yml in trunk as `prelease:true`
add a78db628b0 Fix scrubber falling into infinite loop
add 04c3e816e8 Merge branch 'cassandra-3.0' into cassandra-3.11
add 2b492f17b9 Merge branch 'cassandra-3.11' into cassandra-4.0
add 726b67b1e4 Merge branch 'cassandra-4.0' into cassandra-4.1
new 756d506bd9 Merge branch 'cassandra-4.1' into trunk
The 1 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 +
.../apache/cassandra/db/compaction/Scrubber.java | 12 +++++++----
test/unit/org/apache/cassandra/db/ScrubTest.java | 24 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 4 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-4.1' into trunk
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 756d506bd999c4d0b9e0fce3663c34baf91140f1
Merge: ea44835bf1 726b67b1e4
Author: Jacek Lewandowski <le...@gmail.com>
AuthorDate: Fri Aug 26 17:40:22 2022 +0200
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/Scrubber.java | 12 +++++++----
test/unit/org/apache/cassandra/db/ScrubTest.java | 24 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org