Author: ddas
Date: Sun Sep 18 03:55:28 2011
New Revision: 1172187
URL: http://svn.apache.org/viewvc?rev=1172187&view=rev
Log:
Merge -r 1172185:1172186 from trunk onto branch-0.23. Fixes HADOOP-7631.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1172187&r1=1172186&r2=1172187&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Sun Sep 18 03:55:28 2011
@@ -585,6 +585,9 @@ Release 0.23.0 - Unreleased
HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on
deploy (Eric Yang via ddas)
+ HADOOP-7631. Fixes a config problem to do with running streaming jobs
+ (Eric Yang via ddas)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 18 03:55:28 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986,1170046,1170379,1170459,1171297,1171894,1171909
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986,1170046,1170379,1170459,1171297,1171894,1171909,1172186
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml?rev=1172187&r1=1172186&r2=1172187&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
Sun Sep 18 03:55:28 2011
@@ -83,12 +83,6 @@
</property>
<property>
- <name>stream.tmpdir</name>
- <value>${mapred.temp.dir}</value>
- </property>
-
-
- <property>
<name>mapred.child.java.opts</name>
<value>-server -Xmx640m -Djava.net.preferIPv4Stack=true</value>
</property>
