You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2021/05/28 23:43:34 UTC
[cassandra] branch trunk updated (3b553d8 -> c29bdee)
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 3b553d8 Merge branch 'cassandra-4.0' into trunk
add 5f09226 Don't wait on schema versions from replacement target when replacing a node
add 85358be Merge branch 'cassandra-3.0' into cassandra-3.11
add 80ea99d Merge branch 'cassandra-3.11' into cassandra-4.0
new c29bdee 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 +
.../cassandra/schema/MigrationCoordinator.java | 62 ++++++++++-
.../apache/cassandra/service/StorageService.java | 6 +-
.../distributed/test/MigrationCoordinatorTest.java | 121 +++++++++++++++++++++
.../cassandra/schema/MigrationCoordinatorTest.java | 34 +++---
5 files changed, 202 insertions(+), 22 deletions(-)
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/MigrationCoordinatorTest.java
---------------------------------------------------------------------
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 bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c29bdeed883ab6b840876ec70ee0bc0a432ac2fe
Merge: 3b553d8 80ea99d
Author: Blake Eggleston <bd...@gmail.com>
AuthorDate: Fri May 28 16:28:49 2021 -0700
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
.../cassandra/schema/MigrationCoordinator.java | 62 ++++++++++-
.../apache/cassandra/service/StorageService.java | 6 +-
.../distributed/test/MigrationCoordinatorTest.java | 121 +++++++++++++++++++++
.../cassandra/schema/MigrationCoordinatorTest.java | 34 +++---
5 files changed, 202 insertions(+), 22 deletions(-)
diff --cc CHANGES.txt
index f7927e5,528d129..6652ad0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,6 -16,7 +18,7 @@@ Merged from 3.11
* Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634)
* Ignore stale acks received in the shadow round (CASSANDRA-16588)
Merged from 3.0:
- * Don't wait on schema versions from replacement target when replacing a node (CASSANDRA-16692)
++ * Don't wait on schema versions from replacement target when replacing a node
* StandaloneVerifier does not fail when unable to verify SSTables, it only fails if Corruption is thrown (CASSANDRA-16683)
* Fix bloom filter false ratio calculation by including true negatives (CASSANDRA-15834)
* Prevent loss of commit log data when moving sstables between nodes (CASSANDRA-16619)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org