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 7b3a15d  Merge branch 'cassandra-2.2' into cassandra-3.0
     new f15c6b8  Backport CASSANDRA-16057: Should update in-jvm dtest to 
expose stdout and stderr for nodetool
     new 5bb76ba  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:
 .circleci/config.yml                               | 72 ++++++++---------
 src/java/org/apache/cassandra/tools/NodeProbe.java | 15 ++++
 src/java/org/apache/cassandra/tools/NodeTool.java  | 52 ++++++++-----
 .../tools/{GetVersion.java => Output.java}         | 17 +++-
 .../cassandra/tools/nodetool/BootstrapResume.java  |  4 +-
 .../apache/cassandra/tools/nodetool/Cleanup.java   |  4 +-
 .../cassandra/tools/nodetool/ClearSnapshot.java    |  4 +-
 .../tools/nodetool/CompactionHistory.java          | 12 +--
 .../cassandra/tools/nodetool/CompactionStats.java  |  8 +-
 .../cassandra/tools/nodetool/DescribeCluster.java  | 16 ++--
 .../cassandra/tools/nodetool/DescribeRing.java     |  8 +-
 .../tools/nodetool/FailureDetectorInfo.java        |  4 +-
 .../apache/cassandra/tools/nodetool/GcStats.java   |  6 +-
 .../tools/nodetool/GetCompactionThreshold.java     |  8 +-
 .../tools/nodetool/GetCompactionThroughput.java    |  4 +-
 .../cassandra/tools/nodetool/GetEndpoints.java     |  4 +-
 .../tools/nodetool/GetInterDCStreamThroughput.java |  2 +-
 .../cassandra/tools/nodetool/GetLoggingLevels.java |  6 +-
 .../cassandra/tools/nodetool/GetSSTables.java      |  4 +-
 .../tools/nodetool/GetStreamThroughput.java        |  4 +-
 .../tools/nodetool/GetTraceProbability.java        |  2 +-
 .../cassandra/tools/nodetool/GossipInfo.java       |  4 +-
 .../org/apache/cassandra/tools/nodetool/Info.java  | 41 +++++-----
 .../cassandra/tools/nodetool/ListSnapshots.java    | 12 +--
 .../apache/cassandra/tools/nodetool/NetStats.java  | 44 ++++++-----
 .../cassandra/tools/nodetool/ProxyHistograms.java  | 15 ++--
 .../cassandra/tools/nodetool/RangeKeySample.java   |  6 +-
 .../apache/cassandra/tools/nodetool/Refresh.java   |  2 +-
 .../cassandra/tools/nodetool/RemoveNode.java       |  6 +-
 .../apache/cassandra/tools/nodetool/Repair.java    |  2 +-
 .../org/apache/cassandra/tools/nodetool/Ring.java  | 29 +++----
 .../org/apache/cassandra/tools/nodetool/Scrub.java |  5 +-
 .../apache/cassandra/tools/nodetool/Snapshot.java  | 12 +--
 .../apache/cassandra/tools/nodetool/Status.java    | 34 ++++----
 .../cassandra/tools/nodetool/StatusBackup.java     |  4 +-
 .../cassandra/tools/nodetool/StatusBinary.java     |  4 +-
 .../cassandra/tools/nodetool/StatusGossip.java     |  4 +-
 .../cassandra/tools/nodetool/StatusHandoff.java    |  9 ++-
 .../cassandra/tools/nodetool/StatusThrift.java     |  4 +-
 .../cassandra/tools/nodetool/TableHistograms.java  | 20 +++--
 .../cassandra/tools/nodetool/TableStats.java       | 90 +++++++++++-----------
 .../cassandra/tools/nodetool/TopPartitions.java    | 18 +++--
 .../apache/cassandra/tools/nodetool/TpStats.java   | 12 +--
 .../cassandra/tools/nodetool/UpgradeSSTable.java   |  4 +-
 .../apache/cassandra/tools/nodetool/Verify.java    |  4 +-
 .../apache/cassandra/tools/nodetool/Version.java   |  4 +-
 .../cassandra/distributed/impl/Instance.java       | 62 +++++++++++++--
 .../test/ClientNetworkStopStartTest.java           | 28 ++-----
 .../cassandra/distributed/test/NodeToolTest.java   | 16 +++-
 49 files changed, 435 insertions(+), 316 deletions(-)
 copy src/java/org/apache/cassandra/tools/{GetVersion.java => Output.java} (73%)


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

Reply via email to