You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/03 00:00:50 UTC

[14/14] git commit: Merge branch 'cassandra-2.1' into trunk

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

Branch: refs/heads/trunk
Commit: 23f18595a996d121837bfaedd34f71f1ea39e093
Parents: 1c8e9e8 895c68e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Apr 2 16:56:55 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Apr 2 16:56:55 2014 -0500

----------------------------------------------------------------------
 .../apache/cassandra/metrics/LatencyMetrics.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------