Merge branch 'cassandra-2.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/d0e3f453 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0e3f453 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0e3f453 Branch: refs/heads/trunk Commit: d0e3f45316a96d415ea7ab6d704425b359f0eaa7 Parents: 574e265 a6c6d0f Author: Joshua McKenzie <[email protected]> Authored: Mon Dec 15 13:14:58 2014 -0600 Committer: Joshua McKenzie <[email protected]> Committed: Mon Dec 15 13:14:58 2014 -0600 ---------------------------------------------------------------------- .../concurrent/JMXEnabledThreadPoolExecutor.java | 3 ++- .../org/apache/cassandra/concurrent/SEPExecutor.java | 2 +- src/java/org/apache/cassandra/metrics/SEPMetrics.java | 12 +++++++++++- .../apache/cassandra/metrics/ThreadPoolMetrics.java | 14 +++++++++++++- 4 files changed, 27 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
