Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 5C8C417997 for ; Fri, 1 May 2015 07:01:25 +0000 (UTC) Received: (qmail 3193 invoked by uid 500); 1 May 2015 07:01:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 2837 invoked by uid 500); 1 May 2015 07:01:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 1707 invoked by uid 99); 1 May 2015 07:01:18 -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, 01 May 2015 07:01:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F578E41E4; Fri, 1 May 2015 07:01:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jitendra@apache.org To: common-commits@hadoop.apache.org Date: Fri, 01 May 2015 07:01:31 -0000 Message-Id: <9922e35639c14b9ca1e7d5b3bde01ec5@git.apache.org> In-Reply-To: <25248dba8a894e5ca156f9e3aaee1ea3@git.apache.org> References: <25248dba8a894e5ca156f9e3aaee1ea3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] hadoop git commit: HADOOP-11857. Fix CommandFormat#commandFormat java doc annotation. Contributed by J.Andreina. HADOOP-11857. Fix CommandFormat#commandFormat java doc annotation. Contributed by J.Andreina. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a2459bd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a2459bd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a2459bd Branch: refs/heads/HDFS-7240 Commit: 1a2459bd4be54e64eec0eebffd941989476c2a5b Parents: 8847777 Author: Jakob Homan Authored: Sun Apr 26 18:35:01 2015 -0700 Committer: Jakob Homan Committed: Sun Apr 26 18:35:01 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 ++++- .../src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a2459bd/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 597496a..390dbaf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -204,7 +204,10 @@ Trunk (Unreleased) HADOOP-11850. Typos in hadoop-common java docs. (Surendra Singh Lilhore via jghoman) - HADOOP-11852. Disable symlinks in trunk. + HADOOP-11852. Disable symlinks in trunk. (Andrew Wang) + + HADOOP-11857. Fix CommandFormat#commandFormat java doc annotation. + (J.Andreina via jghoman) BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a2459bd/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java index 0f9aa38..371168d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java @@ -43,7 +43,7 @@ public class CommandFormat { * @see #CommandFormat(int, int, String...) */ @Deprecated - public CommandFormat(String n, int min, int max, String ... possibleOpt) { + public CommandFormat(String name, int min, int max, String ... possibleOpt) { this(min, max, possibleOpt); }