Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/895c68ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/895c68ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/895c68ef Branch: refs/heads/cassandra-2.1 Commit: 895c68ef5e647b446fc445155a4586429fad631a Parents: c749b88 5e51aa4 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 16:56:46 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 16:56:46 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
