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

ifesdjeen pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from f2c9b4c  Merge branch 'cassandra-2.2' into cassandra-3.0
     new 1f72cc6  Extract in-jvm-dtest API
     new c2cfebf  Merge branch 'cassandra-2.2' into cassandra-3.0

The 2 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                                          |   5 +
 src/java/org/apache/cassandra/net/MessageOut.java  |   1 +
 .../org/apache/cassandra/net/MessagingService.java |   2 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |  11 +
 src/java/org/apache/cassandra/tools/NodeTool.java  |   4 +-
 .../org/apache/cassandra/distributed/Cluster.java  |  32 +-
 .../cassandra/distributed/UpgradeableCluster.java  |  32 +-
 .../apache/cassandra/distributed/api/Feature.java  |  24 --
 .../apache/cassandra/distributed/api/ICluster.java |  36 --
 .../cassandra/distributed/api/ICoordinator.java    |  36 --
 .../cassandra/distributed/api/IInstance.java       |  57 ----
 .../cassandra/distributed/api/IInstanceConfig.java |  60 ----
 .../distributed/api/IIsolatedExecutor.java         | 126 -------
 .../apache/cassandra/distributed/api/IListen.java  |  28 --
 .../apache/cassandra/distributed/api/IMessage.java |  37 --
 .../cassandra/distributed/api/IMessageFilters.java |  56 ----
 .../distributed/impl/AbstractCluster.java          | 373 +++++----------------
 .../cassandra/distributed/impl/Coordinator.java    |  56 ++--
 .../impl/DelegatingInvokableInstance.java          |  11 +-
 .../distributed/impl/DistributedTestSnitch.java    |  31 +-
 .../distributed/impl/IInvokableInstance.java       |  67 ----
 .../distributed/impl/IUpgradeableInstance.java     |   1 +
 .../cassandra/distributed/impl/Instance.java       | 272 ++++++++++++---
 .../distributed/impl/InstanceClassLoader.java      | 130 -------
 .../cassandra/distributed/impl/InstanceConfig.java |  98 +++---
 .../distributed/impl/InstanceKiller.java}          |  38 +--
 .../distributed/impl/IsolatedExecutor.java         |   4 +
 .../apache/cassandra/distributed/impl/Listen.java  |   1 -
 .../cassandra/distributed/impl/MessageFilters.java | 168 ----------
 .../impl/{Message.java => MessageImpl.java}        |  27 +-
 .../distributed/impl/NetworkTopology.java          | 137 --------
 .../apache/cassandra/distributed/impl/RowUtil.java |   1 +
 .../cassandra/distributed/impl/TracingUtil.java    |   2 +-
 .../cassandra/distributed/impl/Versions.java       | 190 -----------
 .../mock/nodetool/InternalNodeProbe.java           |  33 +-
 .../mock/nodetool/InternalNodeProbeFactory.java    |  11 +-
 .../cassandra/distributed/test/BootstrapTest.java  |  50 +--
 .../test/DistributedReadWritePathTest.java         | 300 -----------------
 .../distributed/test/DistributedTestBase.java      | 166 ---------
 .../distributed/test/GossipSettlesTest.java        |  16 +-
 .../cassandra/distributed/test/GossipTest.java     |   4 +-
 .../distributed/test/MessageFiltersTest.java       |  85 +++--
 .../distributed/test/MessageForwardingTest.java    |  10 +-
 .../distributed/test/NativeProtocolTest.java       |  49 +--
 .../distributed/test/NetworkTopologyTest.java      |  40 ++-
 .../cassandra/distributed/test/NodeToolTest.java   |   2 +-
 .../distributed/test/ResourceLeakTest.java         |  13 +-
 ...SettlesTest.java => SharedClusterTestBase.java} |  32 +-
 .../distributed/test/SimpleReadWriteTest.java      | 276 +++++++++++++++
 .../cassandra/distributed/test/TestBaseImpl.java   |  47 +++
 .../upgrade/CompactStorage2to3UpgradeTest.java     |  33 +-
 .../upgrade/MixedModeReadRepairTest.java           |   8 +-
 .../cassandra/distributed/upgrade/UpgradeTest.java |  57 ++--
 .../distributed/upgrade/UpgradeTestBase.java       |  21 +-
 .../apache/cassandra/LogbackStatusListener.java    |   2 +-
 55 files changed, 1133 insertions(+), 2276 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/InstanceClassLoader.java
 copy test/{unit/org/apache/cassandra/utils/KillerForTests.java => 
distributed/org/apache/cassandra/distributed/impl/InstanceKiller.java} (52%)
 delete mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/MessageFilters.java
 rename test/distributed/org/apache/cassandra/distributed/impl/{Message.java => 
MessageImpl.java} (74%)
 delete mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/NetworkTopology.java
 delete mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/Versions.java
 delete mode 100644 
test/distributed/org/apache/cassandra/distributed/test/DistributedReadWritePathTest.java
 delete mode 100644 
test/distributed/org/apache/cassandra/distributed/test/DistributedTestBase.java
 copy 
test/distributed/org/apache/cassandra/distributed/test/{GossipSettlesTest.java 
=> SharedClusterTestBase.java} (61%)
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/test/SimpleReadWriteTest.java
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to