This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from df1a2d4 Merge branch 'cassandra-4.0' into trunk
new b1a8a56 Avoid race in AbstractReplicationStrategy endpoint caching
new b5d0626 Merge branch 'cassandra-3.0' into cassandra-3.11
new 9a1bb62 Merge branch 'cassandra-3.11' into cassandra-4.0
new 96c80f0 Merge branch 'cassandra-4.0' into trunk
The 4 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 +
.../locator/AbstractReplicationStrategy.java | 92 ++++++++++++-----
.../apache/cassandra/locator/TokenMetadata.java | 9 +-
.../distributed/test/ring/BootstrapTest.java | 6 +-
.../test/ring/ReadsDuringBootstrapTest.java | 115 +++++++++++++++++++++
.../AbstractReplicationStrategyTest.java} | 36 +++----
6 files changed, 211 insertions(+), 48 deletions(-)
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/ring/ReadsDuringBootstrapTest.java
copy test/unit/org/apache/cassandra/{tools/cqlsh/CqlshTest.java =>
locator/AbstractReplicationStrategyTest.java} (52%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]