This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 6c8c791 Merge branch 'cassandra-3.0' into cassandra-3.11
new 0eb8cec Backport changes from CASSANDRA-16120 to other branches
new 5ef77d2 Merge branch 'cassandra-2.2' into cassandra-3.0
new 925ad35 Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 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:
test/conf/logback-dtest.xml | 27 +----
.../distributed/impl/AbstractCluster.java | 22 +++-
...nstanceIDDefiner.java => ClusterIDDefiner.java} | 22 ++--
.../cassandra/distributed/impl/FileLogAction.java | 133 +++++++++++++++++++++
.../cassandra/distributed/impl/Instance.java | 24 +++-
.../distributed/impl/InstanceIDDefiner.java | 12 +-
.../cassandra/distributed/test/JVMDTestTest.java | 28 +++++
7 files changed, 229 insertions(+), 39 deletions(-)
copy
test/distributed/org/apache/cassandra/distributed/impl/{InstanceIDDefiner.java
=> ClusterIDDefiner.java} (72%)
create mode 100644
test/distributed/org/apache/cassandra/distributed/impl/FileLogAction.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
