Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de3f2396 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de3f2396 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de3f2396 Branch: refs/heads/trunk Commit: de3f2396aa8aa002a23a238e7b707c09c71fab97 Parents: 4a56613 744daf0 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Dec 4 13:10:52 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Dec 4 13:10:52 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(-) ----------------------------------------------------------------------
