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

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


    from 3040965  Merge branch 'cassandra-3.0' into cassandra-3.11
     add 58a5ce1  In-JVM DTest: Add network topology and tracing support
     add 93815db  Merge branch 'cassandra-2.2' into cassandra-3.0
     add 4675b3f  Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                        |   1 +
 build.xml                                          |   2 +-
 ide/idea/workspace.xml                             |   2 +-
 .../apache/cassandra/service/StorageService.java   |   8 +-
 .../org/apache/cassandra/distributed/Cluster.java  |   7 +-
 .../cassandra/distributed/UpgradeableCluster.java  |   7 +-
 .../apache/cassandra/distributed/api/ICluster.java |   2 +
 .../cassandra/distributed/api/ICoordinator.java    |   5 +
 .../cassandra/distributed/api/IInstanceConfig.java |  14 ++
 .../distributed/impl/AbstractCluster.java          | 153 +++++++++++++++++++--
 .../cassandra/distributed/impl/Coordinator.java    |  69 ++++++----
 .../distributed/impl/DistributedTestSnitch.java    |  61 ++++++++
 .../cassandra/distributed/impl/Instance.java       |  32 ++++-
 .../distributed/impl/InstanceClassLoader.java      |   3 +-
 .../cassandra/distributed/impl/InstanceConfig.java |  32 +++--
 .../distributed/impl/IsolatedExecutor.java         |   6 +-
 .../distributed/impl/NetworkTopology.java          |  89 ++++++++++++
 .../cassandra/distributed/impl/TracingUtil.java    | 115 ++++++++++++++++
 .../test/DistributedReadWritePathTest.java         |   2 +-
 .../distributed/test/MessageForwardingTest.java    |  92 +++++++++++++
 .../distributed/test/NetworkTopologyTest.java      |  99 +++++++++++++
 21 files changed, 743 insertions(+), 58 deletions(-)
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/DistributedTestSnitch.java
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/NetworkTopology.java
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/impl/TracingUtil.java
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
 create mode 100644 
test/distributed/org/apache/cassandra/distributed/test/NetworkTopologyTest.java


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

Reply via email to