Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C54101192C for ; Thu, 3 Apr 2014 23:35:19 +0000 (UTC) Received: (qmail 91748 invoked by uid 500); 3 Apr 2014 23:35:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91606 invoked by uid 500); 3 Apr 2014 23:35:10 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 91590 invoked by uid 99); 3 Apr 2014 23:35:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2014 23:35:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E944493D7D8; Thu, 3 Apr 2014 23:35:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Thu, 03 Apr 2014 23:35:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 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/cassandra-2.1 Commit: 6d901f90a33a8e6682512ed6c1f66caf62b3da3d Parents: d71b59e 4b09b8d Author: Brandon Williams Authored: Thu Apr 3 18:31:15 2014 -0500 Committer: Brandon Williams Committed: Thu Apr 3 18:31:15 2014 -0500 ---------------------------------------------------------------------- .../cassandra/metrics/LatencyMetrics.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) ----------------------------------------------------------------------