This is an automated email from the ASF dual-hosted git repository.

mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 25b75df  Merge branch 'cassandra-4.0' into trunk
     new b3f9921  Introduce SemVer4j for version representation, parsing and 
handling. And correct supported upgrade paths. Add v4X to Java DTests (after 
cassandra-4.0 branch was created)
     new 0a84dda  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 0c1e1cc  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 4dcf7d9  Merge branch 'cassandra-3.11' into cassandra-4.0
     new f9a220c  Merge branch 'cassandra-4.0' into trunk

The 5 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:
 build.xml                                          |  2 +-
 .../distributed/impl/AbstractCluster.java          |  2 +-
 .../cassandra/distributed/impl/InstanceConfig.java | 18 ++---
 .../upgrade/CompactStorage3to4UpgradeTest.java     |  2 +-
 .../upgrade/CompactStorageUpgradeTest.java         | 10 +--
 .../cassandra/distributed/upgrade/GroupByTest.java |  2 +-
 .../upgrade/MixedModeAvailabilityTestBase.java     | 17 +++--
 .../upgrade/MixedModeAvailabilityV22Test.java      |  4 +-
 .../upgrade/MixedModeAvailabilityV30Test.java      | 10 +--
 .../upgrade/MixedModeAvailabilityV3XTest.java      |  4 +-
 .../upgrade/MixedModeBatchTestBase.java            | 12 ++-
 .../upgrade/MixedModeConsistencyTestBase.java      | 12 ++-
 .../upgrade/MixedModeConsistencyV22Test.java       |  4 +-
 .../upgrade/MixedModeConsistencyV30Test.java       | 10 +--
 .../upgrade/MixedModeConsistencyV3XTest.java       |  4 +-
 .../upgrade/MixedModeFrom2LoggedBatchTest.java     |  4 +-
 .../upgrade/MixedModeFrom2ReplicationTest.java     |  4 +-
 .../upgrade/MixedModeFrom2UnloggedBatchTest.java   |  4 +-
 .../upgrade/MixedModeFrom3LoggedBatchTest.java     | 12 +--
 .../upgrade/MixedModeFrom3ReplicationTest.java     | 12 +--
 .../upgrade/MixedModeFrom3UnloggedBatchTest.java   | 12 +--
 .../distributed/upgrade/MixedModeGossipTest.java   | 10 ++-
 .../distributed/upgrade/MixedModeReadTest.java     |  5 +-
 .../distributed/upgrade/MixedModeRepairTest.java   |  4 +-
 .../upgrade/MixedModeReplicationTestBase.java      | 12 ++-
 .../cassandra/distributed/upgrade/PagingTest.java  |  2 +-
 .../upgrade/Pre40MessageFilterTest.java            |  5 +-
 .../ReadRepairCompactStorageUpgradeTest.java       |  4 +-
 .../cassandra/distributed/upgrade/UpgradeTest.java |  2 +-
 .../distributed/upgrade/UpgradeTestBase.java       | 86 ++++++++++++++--------
 30 files changed, 154 insertions(+), 137 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to