Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cec93c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cec93c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cec93c4 Branch: refs/heads/trunk Commit: 0cec93c4fb7fd133c5f3a2a4af3828fad8a73fe4 Parents: 2ea405e 6e3a241 Author: Yuki Morishita <[email protected]> Authored: Thu Sep 19 00:50:18 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Sep 19 00:50:18 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/metrics/CacheMetrics.java | 18 +++-- .../cassandra/metrics/ClientRequestMetrics.java | 10 +-- .../cassandra/metrics/CommitLogMetrics.java | 10 ++- .../cassandra/metrics/CompactionMetrics.java | 12 ++-- .../cassandra/metrics/ConnectionMetrics.java | 32 ++++----- .../cassandra/metrics/DefaultNameFactory.java | 71 ++++++++++++++++++++ .../metrics/DroppedMessageMetrics.java | 7 +- .../cassandra/metrics/HintedHandoffMetrics.java | 8 +-- .../cassandra/metrics/LatencyMetrics.java | 30 ++------- .../cassandra/metrics/ReadRepairMetrics.java | 37 +++++----- .../cassandra/metrics/StorageMetrics.java | 11 +-- .../cassandra/metrics/StreamingMetrics.java | 13 ++-- .../cassandra/scheduler/WeightedQueue.java | 2 +- 13 files changed, 148 insertions(+), 113 deletions(-) ----------------------------------------------------------------------
