You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2021/10/03 21:43:44 UTC
[cassandra] 02/02: Merge branch 'cassandra-4.0' into trunk
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c3c2c7efecb23d7627aa8ffda72603dc88f1ed37
Merge: 0945002 3660a58
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Sun Oct 3 23:24:22 2021 +0200
Merge branch 'cassandra-4.0' into trunk
.../org/apache/cassandra/cql3/CQLStatement.java | 5 +
.../org/apache/cassandra/cql3/QueryProcessor.java | 50 +++-
.../cql3/statements/ModificationStatement.java | 3 +-
.../cassandra/cql3/statements/SelectStatement.java | 3 +-
.../cassandra/cql3/statements/UseStatement.java | 5 +
.../statements/schema/AlterSchemaStatement.java | 8 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 105 +++++++-
.../gms/IEndpointStateChangeSubscriber.java | 14 +-
.../net/StartupClusterConnectivityChecker.java | 24 --
.../org/apache/cassandra/repair/RepairSession.java | 6 -
.../apache/cassandra/service/LoadBroadcaster.java | 8 -
.../apache/cassandra/streaming/StreamSession.java | 6 -
.../cassandra/utils/RecomputingSupplier.java | 122 +++++++++
.../distributed/test/GossipShutdownTest.java | 7 -
.../distributed/test/NativeProtocolTest.java | 14 +-
.../test/ReprepareNewBehaviourTest.java | 38 +++
.../distributed/test/ReprepareTestBase.java | 281 +++++++++++++++++++++
.../test/ReprepareTestOldBehaviour.java | 129 ++++++++++
.../cassandra/cql3/PreparedStatementsTest.java | 4 +-
.../cassandra/cql3/PstmtPersistenceTest.java | 36 +--
.../apache/cassandra/metrics/CQLMetricsTest.java | 5 +-
.../cassandra/utils/RecomputingSupplierTest.java | 150 +++++++++++
22 files changed, 933 insertions(+), 90 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org