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/6d901f90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d901f90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d901f90

Branch: refs/heads/trunk
Commit: 6d901f90a33a8e6682512ed6c1f66caf62b3da3d
Parents: d71b59e 4b09b8d
Author: Brandon Williams <[email protected]>
Authored: Thu Apr 3 18:31:15 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Thu Apr 3 18:31:15 2014 -0500

----------------------------------------------------------------------
 .../cassandra/metrics/LatencyMetrics.java       | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


Reply via email to