You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vv...@apache.org on 2016/01/28 07:48:37 UTC

[11/50] [abbrv] hadoop git commit: HADOOP-12730. Hadoop streaming -mapper and -reducer options are wrongly documented as required. Contributed by Kengo Seki.

HADOOP-12730. Hadoop streaming -mapper and -reducer options are wrongly documented as required. Contributed by Kengo Seki.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0bae506c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0bae506c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0bae506c

Branch: refs/heads/YARN-3926
Commit: 0bae506c221f9736d08a6fba00ce5a862ab43cce
Parents: 6831634
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Jan 22 21:08:31 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Jan 22 21:08:31 2016 +0900

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                  | 3 +++
 .../hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bae506c/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2fb1173..36cac2f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1642,6 +1642,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12659. Incorrect usage of config parameters in token manager of
     KMS. (Mingliang Liu via xyao)
 
+    HADOOP-12730. Hadoop streaming -mapper and -reducer options are wrongly
+    documented as required. (Kengo Seki via aajisaka)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bae506c/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm b/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
index 0598a35..2223352 100644
--- a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
+++ b/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
@@ -96,8 +96,8 @@ The Hadoop streaming command options are listed here:
 |:---- |:---- |:---- |
 | -input directoryname or filename | Required | Input location for mapper |
 | -output directoryname | Required | Output location for reducer |
-| -mapper executable or JavaClassName | Required | Mapper executable |
-| -reducer executable or JavaClassName | Required | Reducer executable |
+| -mapper executable or JavaClassName | Optional | Mapper executable. If not specified, IdentityMapper is used as the default |
+| -reducer executable or JavaClassName | Optional | Reducer executable. If not specified, IdentityReducer is used as the default |
 | -file filename | Optional | Make the mapper, reducer, or combiner executable available locally on the compute nodes |
 | -inputformat JavaClassName | Optional | Class you supply should return key/value pairs of Text class. If not specified, TextInputFormat is used as the default |
 | -outputformat JavaClassName | Optional | Class you supply should take key/value pairs of Text class. If not specified, TextOutputformat is used as the default |