Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/744daf04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744daf04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/744daf04 Branch: refs/heads/trunk Commit: 744daf042ec4afdba9949abe95fb473c3d5acc6b Parents: f0d45ea 05300b2 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:10:42 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:10:42 2015 -0500 ---------------------------------------------------------------------- .../cassandra/metrics/ThreadPoolMetrics.java | 31 +++++++++++++++++++- .../org/apache/cassandra/tools/NodeProbe.java | 15 ++++++++-- .../cassandra/tools/nodetool/TpStats.java | 23 ++++++++------- .../apache/cassandra/utils/StatusLogger.java | 15 +++++----- 4 files changed, 63 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
