This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 5ef77d2 Merge branch 'cassandra-2.2' into cassandra-3.0
new 521a6e2 Fixed a NullPointerException when calling nodetool
enablethrift
new 42989ce 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:
CHANGES.txt | 2 +
build.xml | 3 +
.../apache/cassandra/service/CassandraDaemon.java | 105 ++++++-----
.../apache/cassandra/service/StorageService.java | 11 +-
.../distributed/impl/AbstractCluster.java | 18 +-
.../cassandra/distributed/impl/Instance.java | 33 +++-
.../cassandra/distributed/shared/Byteman.java | 207 +++++++++++++++++++++
.../shared/{ShutdownException.java => Shared.java} | 23 ++-
.../test/BootstrapBinaryDisabledTest.java | 165 ++++++++++++++++
.../test/ClientNetworkStopStartTest.java | 192 +++++++++++++++++++
test/resources/byteman/stream_failure.btm | 14 ++
11 files changed, 707 insertions(+), 66 deletions(-)
create mode 100644
test/distributed/org/apache/cassandra/distributed/shared/Byteman.java
copy
test/distributed/org/apache/cassandra/distributed/shared/{ShutdownException.java
=> Shared.java} (56%)
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/BootstrapBinaryDisabledTest.java
create mode 100644
test/distributed/org/apache/cassandra/distributed/test/ClientNetworkStopStartTest.java
create mode 100644 test/resources/byteman/stream_failure.btm
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
