Repository: hadoop Updated Branches: refs/heads/branch-2 463195dbe -> 44a020ed8
HDFS-9777. Fix typos in DFSAdmin command line and documentation.(Wei-Chiu Chuang via umamahesh) (cherry picked from commit bffaa38a91b26920206a3350bf1cd60ec950aa74) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44a020ed Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44a020ed Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44a020ed Branch: refs/heads/branch-2 Commit: 44a020ed813daa0ad674119ba3fe438a5ced0d3e Parents: 463195d Author: Uma Maheswara Rao G <uma.ganguma...@intel.com> Authored: Mon Feb 8 13:47:45 2016 -0800 Committer: Uma Maheswara Rao G <uma.ganguma...@intel.com> Committed: Mon Feb 8 14:00:47 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml | 2 +- .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/44a020ed/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java index 85b9d6c..a3af28a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java @@ -133,7 +133,7 @@ public class HdfsConstants { } } - /** Covert the given String to a RollingUpgradeAction. */ + /** Convert the given String to a RollingUpgradeAction. */ public static RollingUpgradeAction fromString(String s) { return MAP.get(StringUtils.toUpperCase(s)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/44a020ed/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b953858..adb60aa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -973,6 +973,9 @@ Release 2.8.0 - UNRELEASED HDFS-9503. Use generic option -fs for NNThroughputBenchmark instead of -namenode. (Mingliang Liu via shv) + HDFS-9777. Fix typos in DFSAdmin command line and documentation. + (Wei-Chiu Chuang via umamahesh) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/44a020ed/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml index 5514700..e4915a7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml @@ -3308,7 +3308,7 @@ order written.</p>]]> deprecated="not deprecated"> <param name="s" type="java.lang.String"/> <doc> - <![CDATA[Covert the given String to a RollingUpgradeAction.]]> + <![CDATA[Convert the given String to a RollingUpgradeAction.]]> </doc> </method> </class> http://git-wip-us.apache.org/repos/asf/hadoop/blob/44a020ed/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index 59be89c..44dfcd9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -373,7 +373,7 @@ public class DFSAdmin extends FsShell { final RollingUpgradeAction action = RollingUpgradeAction.fromString( argv.length >= 2? argv[1]: ""); if (action == null) { - throw new IllegalArgumentException("Failed to covert \"" + argv[1] + throw new IllegalArgumentException("Failed to convert \"" + argv[1] +"\" to " + RollingUpgradeAction.class.getSimpleName()); }
