Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1186546 from trunk to branch-0.23 to complete fix for MAPREDUCE-3212. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186547 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-19 22:43:27 +00:00
parent c56916f582
commit 797ee4c4d3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1646,6 +1646,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3208. Fix NPE task/container log appenders. (liangzhwa via
acmurthy)
MAPREDUCE-3212. Fix usage/help message for bin/yarn. (Bhallamudi Venkata
Siva Kamesh via acmurthy)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/bin/yarn
View File

@ -53,7 +53,7 @@ esac
# if no args specified, show usage
if [ $# = 0 ]; then
echo "Usage: hadoop [--config confdir] COMMAND"
echo "Usage: yarn [--config confdir] COMMAND"
echo "where COMMAND is one of:"
echo " resourcemanager run the ResourceManager"
echo " nodemanager run a nodemanager on each slave"