Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5525D200B4C for ; Fri, 22 Jul 2016 18:12:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 52147160A8E; Fri, 22 Jul 2016 16:12:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9BE0D160A5A for ; Fri, 22 Jul 2016 18:12:00 +0200 (CEST) Received: (qmail 31722 invoked by uid 500); 22 Jul 2016 16:11:59 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 31713 invoked by uid 99); 22 Jul 2016 16:11:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jul 2016 16:11:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE197E058E; Fri, 22 Jul 2016 16:11:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Fri, 22 Jul 2016 16:11:59 -0000 Message-Id: <3ddb190feb4c4dfb940954fd64a9695f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] accumulo git commit: ACCUMULO-4387 fix javadoc issue archived-at: Fri, 22 Jul 2016 16:12:01 -0000 Repository: accumulo Updated Branches: refs/heads/master ad985473a -> 5df9bc16f ACCUMULO-4387 fix javadoc issue Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d074eff9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d074eff9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d074eff9 Branch: refs/heads/master Commit: d074eff92883cbaf62158d79d182f76a623fe6f8 Parents: c587a6f Author: Keith Turner Authored: Fri Jul 22 11:52:35 2016 -0400 Committer: Keith Turner Committed: Fri Jul 22 11:52:35 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/MasterTime.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d074eff9/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java b/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java index 27c57f0..93e81e7 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java +++ b/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java @@ -61,7 +61,7 @@ public class MasterTime extends TimerTask { /** * How long has this cluster had a Master? * - * @returns Approximate total duration this cluster has had a Master, in milliseconds. + * @return Approximate total duration this cluster has had a Master, in milliseconds. */ public synchronized long getTime() { return MILLISECONDS.convert(System.nanoTime() + skewAmount, NANOSECONDS);