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

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


    from 7a63cc2  Merge branch 'cassandra-3.11' into trunk
     new 4d173e0  Don't adjust nodeCount when setting node id topology in 
in-jvm dtests. Make sure we don't throw any uncaught exceptions during in-jvm 
dtests.
     new 5a2b5a4  Merge branch 'cassandra-2.2' into cassandra-3.0
     new b1efb8e  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 21a363b  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 +-
 .../distributed/impl/AbstractCluster.java          | 37 ++++++++++++++++++++--
 .../impl/DelegatingInvokableInstance.java          |  1 +
 .../cassandra/distributed/impl/Instance.java       |  3 +-
 .../cassandra/distributed/impl/InstanceConfig.java | 14 ++++++--
 .../{RepairResult.java => ShutdownException.java}  | 15 ++++-----
 .../distributed/test/FailingRepairTest.java        |  6 ++++
 .../test/FullRepairCoordinatorFastTest.java        |  1 +
 .../test/IncrementalRepairCoordinatorFastTest.java |  1 +
 .../distributed/test/NetworkTopologyTest.java      | 15 +++++----
 .../test/PreviewRepairCoordinatorFastTest.java     |  2 ++
 .../cassandra/distributed/test/StreamingTest.java  |  5 ++-
 .../cassandra/distributed/upgrade/UpgradeTest.java |  6 +++-
 13 files changed, 86 insertions(+), 22 deletions(-)
 copy 
test/distributed/org/apache/cassandra/distributed/shared/{RepairResult.java => 
ShutdownException.java} (76%)


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

Reply via email to