Author: harsh
Date: Tue May 29 16:10:59 2012
New Revision: 1343804
URL: http://svn.apache.org/viewvc?rev=1343804&view=rev
Log:
MAPREDUCE-3493. Add the default mapreduce.shuffle.port property to
mapred-default.xml. Contributed by Madhukara Phatak. (harsh)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1343804&r1=1343803&r2=1343804&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue May 29
16:10:59 2012
@@ -154,6 +154,9 @@ Release 2.0.1-alpha - UNRELEASED
MAPREDUCE-4224. TestFifoScheduler throws
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
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1343804&r1=1343803&r2=1343804&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Tue May 29 16:10:59 2012
@@ -1126,6 +1126,15 @@
</description>
</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 -->
<property>
