Details
-
Type:
Improvement
-
Status: Closed
-
Priority:
Major
-
Resolution: Fixed
-
Affects Version/s: 0.23.0
-
Fix Version/s: 0.23.1
-
Component/s: fs
-
Labels:None
-
Hadoop Flags:Incompatible change, Reviewed
-
Release Note:The 'fs -getmerge' tool now uses a -nl flag to determine if adding a newline at end of each file is required, in favor of the 'addnl' boolean flag that was used earlier.
Description
The [addnl] option of FsShell getmerge should be either "true" or "false",but it is very hard to understand by users, especially who`s never used this option before.
So,the [addnl] option should be changed to [-nl] for consistency.
Issue Links
- blocks
-
HDFS-2070
Add more unit tests for FsShell getmerge
-
- Resolved
-
- is duplicated by
-
HADOOP-7340
incomplete help message is displayed for getmerge [addnl] option
-
- Resolved
-
- is related to
-
HADOOP-12359
hadoop fs -getmerge doc is wrong
-
- Closed
-
Activity
- All
- Comments
- Work Log
- History
- Activity
- Transitions
-1 overall. Here are the results of testing the latest attachment
http://issues.apache.org/jira/secure/attachment/12481040/HADOOP-7348.patch
against trunk revision 1129989.
+1 @author. The patch does not contain any @author tags.
-1 tests included. The patch doesn't appear to include any new or modified tests.
Please justify why no new tests are needed for this patch.
Also please list what manual steps were performed to verify this patch.
+1 javadoc. The javadoc tool did not generate any warning messages.
+1 javac. The applied patch does not increase the total number of javac compiler warnings.
+1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.
+1 release audit. The applied patch does not increase the total number of release audit warnings.
-1 core tests. The patch failed these core unit tests:
org.apache.hadoop.cli.TestCLI
+1 system test framework. The patch passed system test framework compile.
Test results: https://builds.apache.org/hudson/job/PreCommit-HADOOP-Build/554//testReport/
Findbugs warnings: https://builds.apache.org/hudson/job/PreCommit-HADOOP-Build/554//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
Console output: https://builds.apache.org/hudson/job/PreCommit-HADOOP-Build/554//console
This message is automatically generated.
I see you beat me to removing my TODO, nice! I'd suggest using a tertiary for assignment, but that's just me, so up to you:
delimiter = cf.getOpt("nl") ? "\n" : null;
Please update the DESCRIPTION to include the -nl option, update the text in TestCLI, and update the hdfs tests (link the jira to this one). The applicable tests will be in TestDFSShell and/or TestHDFSCLI.
Reuploading the patch.Thanks Daryn,you teach me so many things.
-1 overall. Here are the results of testing the latest attachment
http://issues.apache.org/jira/secure/attachment/12481783/HADOOP-7348.patch_2
against trunk revision 1133125.
+1 @author. The patch does not contain any @author tags.
+1 tests included. The patch appears to include 4 new or modified tests.
+1 javadoc. The javadoc tool did not generate any warning messages.
-1 javac. The applied patch generated 1068 javac compiler warnings (more than the trunk's current 1067 warnings).
+1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.
+1 release audit. The applied patch does not increase the total number of release audit warnings.
+1 core tests. The patch passed core unit tests.
+1 system test framework. The patch passed system test framework compile.
Test results: https://builds.apache.org/job/PreCommit-HADOOP-Build/593//testReport/
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/593//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
Console output: https://builds.apache.org/job/PreCommit-HADOOP-Build/593//console
This message is automatically generated.
Please revert new CommandFormat(null, 2, 3, "nl"); to omit the first parameter (null). The CommandFormat ctor that takes the unused parameter has been deprecated, so that's probably the -1 warning in the QA build. I'd also recommend moving the -nl to the front of the usage to be consistent with other commands. Ie. USAGE = "[-nl] <src> <localdst>".
Other than that, looks good! Just be sure to update the aforementioned tests in hdfs. Please link that jira to this one to make it easier to track.
Thanks for your comments,i`ll renew this patch.
But there`s no any auto-test for FsShell getmerge in hdfs.And there`s a note in the file testHDFSConf.xml:
<!-- Tests for getmerge -->
<!-- Manual Testing -->
+1 overall. Here are the results of testing the latest attachment
http://issues.apache.org/jira/secure/attachment/12482022/HADOOP-7348.patch
against trunk revision 1133125.
+1 @author. The patch does not contain any @author tags.
+1 tests included. The patch appears to include 4 new or modified tests.
+1 javadoc. The javadoc tool did not generate any warning messages.
+1 javac. The applied patch does not increase the total number of javac compiler warnings.
+1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.
+1 release audit. The applied patch does not increase the total number of release audit warnings.
+1 core tests. The patch passed core unit tests.
+1 system test framework. The patch passed system test framework compile.
Test results: https://builds.apache.org/job/PreCommit-HADOOP-Build/607//testReport/
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/607//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
Console output: https://builds.apache.org/job/PreCommit-HADOOP-Build/607//console
This message is automatically generated.
+1 Very nice!
It's too bad there aren't hdfs tests since it wouldn't be hard to do... Would you mind filing a jira for the need to add tests so we don't forget it needs to be done?
It`s my pleasure. 
I just noticed the the DESCRIPTION has two unnecessary newlines at the end. If you could remove those, I hope this can be committed soon!
Thanks for your review.
I removed the newlines in the latest patch.
+1 again, hopefully we can get this committed soon!
Updated the patch with new directory structure.
+1 overall. Here are the results of testing the latest attachment
http://issues.apache.org/jira/secure/attachment/12493130/HADOOP-7348-v0.4.patch
against trunk revision .
+1 @author. The patch does not contain any @author tags.
+1 tests included. The patch appears to include 4 new or modified tests.
+1 javadoc. The javadoc tool did not generate any warning messages.
+1 javac. The applied patch does not increase the total number of javac compiler warnings.
+1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.
+1 release audit. The applied patch does not increase the total number of release audit warnings.
+1 core tests. The patch passed unit tests in hadoop-common-project.
+1 contrib tests. The patch passed contrib unit tests.
Test results: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//testReport/
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//artifact/trunk/patchprocess/newPatchFindbugsWarningshadoop-auth.html
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//artifact/trunk/patchprocess/newPatchFindbugsWarningshadoop-common.html
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//artifact/trunk/patchprocess/newPatchFindbugsWarningshadoop-annotations.html
Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//artifact/trunk/patchprocess/newPatchFindbugsWarningshadoop-auth-examples.html
Console output: https://builds.apache.org/job/PreCommit-HADOOP-Build/138//console
This message is automatically generated.
Can someone please review and commit this patch?
XieXianshan,
+1 from me as well. Updated patch to add some docs changes too. Committing.
Committed revision 1225192 to trunk. Thank you for your contribution XieXianshan! Thanks for the review too Daryn!
Integrated in Hadoop-Hdfs-trunk-Commit #1546 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk-Commit/1546/)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
harsh : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1225192
Files :
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
Although this is an improvement, its an incompatible change so I've marked it so and updated release notes.
Integrated in Hadoop-Common-trunk-Commit #1474 (See https://builds.apache.org/job/Hadoop-Common-trunk-Commit/1474/)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
harsh : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1225192
Files :
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
Integrated in Hadoop-Mapreduce-trunk-Commit #1495 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk-Commit/1495/)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
harsh : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1225192
Files :
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
Integrated in Hadoop-Hdfs-trunk #909 (See https://builds.apache.org/job/Hadoop-Hdfs-trunk/909/)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
harsh : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1225192
Files :
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
Integrated in Hadoop-Mapreduce-trunk #942 (See https://builds.apache.org/job/Hadoop-Mapreduce-trunk/942/)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead (XieXianshan via harsh)
harsh : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1225192
Files :
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
This breaks a public API, why not preserve it but add in the improved one and update the docs to refer to it? Also, the test for this (HDFS-2070) should be done before the change.
See HADOOP-7966. Merging to 23 so it's consistent.
Integrated in Hadoop-Common-0.23-Commit #359 (See https://builds.apache.org/job/Hadoop-Common-0.23-Commit/359/)
HADOOP-7348. svn merge -c 1225192 from trunk
eli : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1229469
Files :
- /hadoop/common/branches/branch-0.23
- /hadoop/common/branches/branch-0.23/hadoop-common-project
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/native
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/.gitignore
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job
- /hadoop/common/branches/branch-0.23/hadoop-project
- /hadoop/common/branches/branch-0.23/hadoop-project/src/site
Integrated in Hadoop-Hdfs-0.23-Commit #349 (See https://builds.apache.org/job/Hadoop-Hdfs-0.23-Commit/349/)
HADOOP-7348. svn merge -c 1225192 from trunk
eli : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1229469
Files :
- /hadoop/common/branches/branch-0.23
- /hadoop/common/branches/branch-0.23/hadoop-common-project
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/native
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/.gitignore
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job
- /hadoop/common/branches/branch-0.23/hadoop-project
- /hadoop/common/branches/branch-0.23/hadoop-project/src/site
Integrated in Hadoop-Mapreduce-0.23-Commit #370 (See https://builds.apache.org/job/Hadoop-Mapreduce-0.23-Commit/370/)
HADOOP-7348. svn merge -c 1225192 from trunk
eli : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1229469
Files :
- /hadoop/common/branches/branch-0.23
- /hadoop/common/branches/branch-0.23/hadoop-common-project
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/native
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/.gitignore
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job
- /hadoop/common/branches/branch-0.23/hadoop-project
- /hadoop/common/branches/branch-0.23/hadoop-project/src/site
Integrated in Hadoop-Hdfs-0.23-Build #134 (See https://builds.apache.org/job/Hadoop-Hdfs-0.23-Build/134/)
HADOOP-7348. svn merge -c 1225192 from trunk
eli : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1229469
Files :
- /hadoop/common/branches/branch-0.23
- /hadoop/common/branches/branch-0.23/hadoop-common-project
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/native
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/.gitignore
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job
- /hadoop/common/branches/branch-0.23/hadoop-project
- /hadoop/common/branches/branch-0.23/hadoop-project/src/site
Integrated in Hadoop-Mapreduce-0.23-Build #156 (See https://builds.apache.org/job/Hadoop-Mapreduce-0.23-Build/156/)
HADOOP-7348. svn merge -c 1225192 from trunk
eli : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1229469
Files :
- /hadoop/common/branches/branch-0.23
- /hadoop/common/branches/branch-0.23/hadoop-common-project
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core
- /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/native
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary
- /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/.gitignore
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/bin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/conf
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/c++
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/block_forensics
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build-contrib.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/build.xml
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/eclipse-plugin
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/index
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/vaidya
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/examples
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
- /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/webapps/job
- /hadoop/common/branches/branch-0.23/hadoop-project
- /hadoop/common/branches/branch-0.23/hadoop-project/src/site
This needs to be updated in the 2.5.1 documentation as it still takes to use addnl. only local help states -nl
thanks
fix this issue.