You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jg...@apache.org on 2015/04/27 03:35:35 UTC

hadoop git commit: HADOOP-11857. Fix CommandFormat#commandFormat java doc annotation. Contributed by J.Andreina.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 8847777ae -> 1a2459bd4


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/trunk
Commit: 1a2459bd4be54e64eec0eebffd941989476c2a5b
Parents: 8847777
Author: Jakob Homan <jg...@gmail.com>
Authored: Sun Apr 26 18:35:01 2015 -0700
Committer: Jakob Homan <jg...@gmail.com>
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);
   }