Author: wheat9
Date: Thu Apr 3 20:20:27 2014
New Revision: 1584377
URL: http://svn.apache.org/r1584377
Log:
HDFS-6190. Merge r1584376 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1584377&r1=1584376&r2=1584377&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Apr 3 20:20:27 2014
@@ -57,6 +57,8 @@ Release 2.5.0 - UNRELEASED
HDFS-5591. Checkpointing should use monotonic time when calculating period.
(Charles Lamb via wang)
+ HDFS-6190. Minor textual fixes in DFSClient. (Charles Lamb via wheat9)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java?rev=1584377&r1=1584376&r2=1584377&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
Thu Apr 3 20:20:27 2014
@@ -236,7 +236,7 @@ public class DFSAdmin extends FsShell {
"\t\ton the total size of all the files under the directory tree.\n" +
"\t\tThe extra space required for replication is also counted. E.g.\n" +
"\t\ta 1GB file with replication of 3 consumes 3GB of the quota.\n\n" +
- "\t\tQuota can also be speciefied with a binary prefix for terabytes,\n"
+
+ "\t\tQuota can also be specified with a binary prefix for terabytes,\n" +
"\t\tpetabytes etc (e.g. 50t is 50TB, 5m is 5MB, 3p is 3PB).\n" +
"\t\tFor each directory, attempt to set the quota. An error will be
reported if\n" +
"\t\t1. N is not a positive integer, or\n" +
@@ -637,7 +637,7 @@ public class DFSAdmin extends FsShell {
}
private void printHelp(String cmd) {
- String summary = "hadoop dfsadmin is the command to execute DFS
administrative commands.\n" +
+ String summary = "hadoop dfsadmin performs DFS administrative commands.\n"
+
"The full syntax is: \n\n" +
"hadoop dfsadmin [-report] [-safemode <enter | leave | get | wait>]\n" +
"\t[-saveNamespace]\n" +
