This is an automated email from the ASF dual-hosted git repository. ifesdjeen pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 244d4c2 Merge branch 'cassandra-3.11' into trunk new 1f72cc6 Extract in-jvm-dtest API new c2cfebf Merge branch 'cassandra-2.2' into cassandra-3.0 new a7820d1 Merge branch 'cassandra-3.0' into cassandra-3.11 new 0934730 Merge branch 'cassandra-3.11' 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: build.xml | 2 + .../org/apache/cassandra/distributed/Cluster.java | 28 +- .../cassandra/distributed/UpgradeableCluster.java | 31 +- .../apache/cassandra/distributed/api/Feature.java | 24 -- .../apache/cassandra/distributed/api/ICluster.java | 36 --- .../cassandra/distributed/api/ICoordinator.java | 40 --- .../cassandra/distributed/api/IInstance.java | 73 ----- .../cassandra/distributed/api/IInstanceConfig.java | 60 ---- .../distributed/api/IIsolatedExecutor.java | 126 -------- .../apache/cassandra/distributed/api/IListen.java | 28 -- .../apache/cassandra/distributed/api/IMessage.java | 38 --- .../cassandra/distributed/api/IMessageFilters.java | 100 ------- .../distributed/impl/AbstractCluster.java | 319 +++------------------ .../cassandra/distributed/impl/Coordinator.java | 31 +- .../impl/DelegatingInvokableInstance.java | 10 +- .../distributed/impl/DistributedTestSnitch.java | 31 +- .../distributed/impl/IInvokableInstance.java | 67 ----- .../distributed/impl/IUpgradeableInstance.java | 28 -- .../cassandra/distributed/impl/Instance.java | 111 ++++--- .../distributed/impl/InstanceClassLoader.java | 142 --------- .../cassandra/distributed/impl/InstanceConfig.java | 100 ++++--- .../distributed/impl/IsolatedExecutor.java | 4 + .../cassandra/distributed/impl/MessageFilters.java | 195 ------------- .../cassandra/distributed/impl/MessageImpl.java | 10 +- .../distributed/impl/NetworkTopology.java | 137 --------- .../cassandra/distributed/impl/TracingUtil.java | 2 +- .../cassandra/distributed/impl/Versions.java | 213 -------------- .../distributed/shared}/RepairResult.java | 16 +- .../cassandra/distributed/test/BootstrapTest.java | 50 ++-- .../cassandra/distributed/test/CasWriteTest.java | 34 +-- .../distributed/test/DistributedRepairUtils.java | 4 +- .../distributed/test/DistributedTestBase.java | 173 ----------- .../distributed/{impl => test}/ExecUtil.java | 2 +- .../distributed/test/FailingRepairTest.java | 26 +- .../distributed/test/GossipSettlesTest.java | 16 +- .../distributed/test/LargeColumnTest.java | 37 +-- .../distributed/test/MessageFiltersTest.java | 24 +- .../distributed/test/MessageForwardingTest.java | 34 +-- .../distributed/test/NativeProtocolTest.java | 49 ++-- .../distributed/test/NetworkTopologyTest.java | 40 ++- .../cassandra/distributed/test/NodeToolTest.java | 6 +- .../distributed/test/PreviewRepairTest.java | 36 +-- .../test/QueryReplayerEndToEndTest.java | 13 +- .../cassandra/distributed/test/ReadRepairTest.java | 22 +- .../distributed/test/RepairCoordinatorBase.java | 2 +- .../test/RepairCoordinatorFailingMessageTest.java | 2 +- .../distributed/test/RepairCoordinatorFast.java | 2 +- .../distributed/test/RepairCoordinatorSlow.java | 1 - .../distributed/test/RepairDigestTrackingTest.java | 9 +- .../cassandra/distributed/test/RepairTest.java | 42 +-- .../distributed/test/ResourceLeakTest.java | 22 +- .../distributed/test/SimpleReadWriteTest.java | 50 ++-- .../cassandra/distributed/test/StreamingTest.java | 4 +- .../{GossipSettlesTest.java => TestBaseImpl.java} | 34 ++- .../upgrade/MixedModeReadRepairTest.java | 21 +- .../cassandra/distributed/upgrade/UpgradeTest.java | 41 ++- .../distributed/upgrade/UpgradeTestBase.java | 19 +- .../CassandraIsolatedJunit4ClassRunner.java | 6 +- .../apache/cassandra/LogbackStatusListener.java | 2 +- .../config/DatabaseDescriptorRefTest.java | 4 +- 60 files changed, 616 insertions(+), 2213 deletions(-) delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/Feature.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/ICluster.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IInstance.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IInstanceConfig.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IIsolatedExecutor.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IListen.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IMessage.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/api/IMessageFilters.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/IInvokableInstance.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/IUpgradeableInstance.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/InstanceClassLoader.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/MessageFilters.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/NetworkTopology.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/impl/Versions.java copy {src/java/org/apache/cassandra/repair => test/distributed/org/apache/cassandra/distributed/shared}/RepairResult.java (75%) delete mode 100644 test/distributed/org/apache/cassandra/distributed/test/DistributedTestBase.java rename test/distributed/org/apache/cassandra/distributed/{impl => test}/ExecUtil.java (96%) copy test/distributed/org/apache/cassandra/distributed/test/{GossipSettlesTest.java => TestBaseImpl.java} (51%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org