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

svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-05-29 16:15:25 +00:00
parent 5e473c9c6e
commit 4200fa906e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,9 @@ Release 2.0.1-alpha - UNRELEASED
MAPREDUCE-4224. TestFifoScheduler throws MAPREDUCE-4224. TestFifoScheduler throws
org.apache.hadoop.metrics2.MetricsException (Devaraj K via tgraves) org.apache.hadoop.metrics2.MetricsException (Devaraj K via tgraves)
MAPREDUCE-3493. Add the default mapreduce.shuffle.port property
to mapred-default.xml (Madhukara Phatak via harsh)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
View File

@ -1126,6 +1126,15 @@
</description> </description>
</property> </property>
<property>
<name>mapreduce.shuffle.port</name>
<value>8080</value>
<description>Default port that the ShuffleHandler will run on. ShuffleHandler
is a service run at the NodeManager to facilitate transfers of intermediate
Map outputs to requesting Reducers.
</description>
</property>
<!-- Node health script variables --> <!-- Node health script variables -->
<property> <property>