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

svn merge -c 1503957 FIXES: MAPREDUCE-5380. Invalid mapred command should return non-zero exit code. Contributed by Stephen Chu 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503958 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2013-07-17 00:31:52 +00:00
parent 2767f51220
commit a55ae9e988
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,9 @@ Release 2.3.0 - UNRELEASED
MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl
(Devaraj K via jlowe) (Devaraj K via jlowe)
MAPREDUCE-5380. Invalid mapred command should return non-zero exit code
(Stephen Chu via jlowe)
Release 2.2.0 - UNRELEASED Release 2.2.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES
@ -1097,6 +1100,9 @@ Release 0.23.10 - UNRELEASED
MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the
input path dir (Devaraj K via jlowe) input path dir (Devaraj K via jlowe)
MAPREDUCE-5380. Invalid mapred command should return non-zero exit code
(Stephen Chu via jlowe)
Release 0.23.9 - 2013-07-08 Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/bin/mapred
View File

@ -83,7 +83,7 @@ elif [ "$COMMAND" = "mradmin" ] \
echo "Sorry, the $COMMAND command is no longer supported." echo "Sorry, the $COMMAND command is no longer supported."
echo "You may find similar functionality with the \"yarn\" shell command." echo "You may find similar functionality with the \"yarn\" shell command."
print_usage print_usage
exit exit 1
elif [ "$COMMAND" = "distcp" ] ; then elif [ "$COMMAND" = "distcp" ] ; then
CLASS=org.apache.hadoop.tools.DistCp CLASS=org.apache.hadoop.tools.DistCp
CLASSPATH=${CLASSPATH}:${TOOL_PATH} CLASSPATH=${CLASSPATH}:${TOOL_PATH}
@ -95,7 +95,7 @@ elif [ "$COMMAND" = "archive" ] ; then
else else
echo $COMMAND - invalid command echo $COMMAND - invalid command
print_usage print_usage
exit exit 1
fi fi
# for developers, add mapred classes to CLASSPATH # for developers, add mapred classes to CLASSPATH