You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2021/08/17 19:22:12 UTC
[cassandra] branch trunk updated (dc77cb8 -> 5b325b8)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from dc77cb8 Merge branch 'cassandra-4.0' into trunk
add e581a85 Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition patch by Ekaterina Dimitrova; reviewed by Brandon Williams for CASSANDRA-16835
add cb19b39 Merge branch 'cassandra-3.11' into cassandra-4.0
new 5b325b8 Merge branch 'cassandra-4.0' 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 | 167 +++++++++++----------
.../cql3/validation/operations/TTLTest.java | 2 +-
test/unit/org/apache/cassandra/db/ScrubTest.java | 39 +++--
4 files changed, 109 insertions(+), 100 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.0' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5b325b8c514911070ce63f5dafa897f321780a2b
Merge: dc77cb8 cb19b39
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Tue Aug 17 15:15:34 2021 -0400
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/db/compaction/Scrubber.java | 167 +++++++++++----------
.../cql3/validation/operations/TTLTest.java | 2 +-
test/unit/org/apache/cassandra/db/ScrubTest.java | 39 +++--
4 files changed, 109 insertions(+), 100 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org