Author: harsh
Date: Tue May 29 16:15:25 2012
New Revision: 1343809
URL: http://svn.apache.org/viewvc?rev=1343809&view=rev
Log:
svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(contents, props changed)
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1343809&r1=1343808&r2=1343809&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue
May 29 16:15:25 2012
@@ -36,6 +36,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
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1343804
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1343809&r1=1343808&r2=1343809&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Tue May 29 16:15:25 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>
Propchange:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1343804
