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

Merge -r 1172185:1172186 from trunk onto branch-0.23. Fixes HADOOP-7631. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172187 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devaraj Das 2011-09-18 03:55:28 +00:00
parent 8c99dc8435
commit 570a618e87
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,6 +585,9 @@ Release 0.23.0 - Unreleased
HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on
deploy (Eric Yang via ddas) 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 Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-common-project/hadoop-common/src/main/packages/templates/conf/mapred-site.xml
View File

@ -82,12 +82,6 @@
<value>INFO,TLA</value> <value>INFO,TLA</value>
</property> </property>
<property>
<name>stream.tmpdir</name>
<value>${mapred.temp.dir}</value>
</property>
<property> <property>
<name>mapred.child.java.opts</name> <name>mapred.child.java.opts</name>
<value>-server -Xmx640m -Djava.net.preferIPv4Stack=true</value> <value>-server -Xmx640m -Djava.net.preferIPv4Stack=true</value>