Author: harsh
Date: Sun Jul 8 17:24:38 2012
New Revision: 1358789
URL: http://svn.apache.org/viewvc?rev=1358789&view=rev
Log:
Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
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=1358789&r1=1358788&r2=1358789&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sun
Jul 8 17:24:38 2012
@@ -143,6 +143,9 @@ Release 2.0.0-alpha - 05-23-2012
HADOOP-8285 MR changes for Use ProtoBuf for RpcPayLoadHeader (sanjay radia)
+ MAPREDUCE-2220. Fix new API FileOutputFormat-related typos in
+ mapred-default.xml (Rui Kubo via harsh)
+
OPTIMIZATIONS
BUG FIXES
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=1358789&r1=1358788&r2=1358789&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
Sun Jul 8 17:24:38 2012
@@ -692,7 +692,7 @@
</property>
<property>
- <name>mapreduce.output.fileoutputformat.compression.type</name>
+ <name>mapreduce.output.fileoutputformat.compress.type</name>
<value>RECORD</value>
<description>If the job outputs are to compressed as SequenceFiles, how
should
they be compressed? Should be one of NONE, RECORD or BLOCK.
@@ -700,7 +700,7 @@
</property>
<property>
- <name>mapreduce.output.fileoutputformat.compression.codec</name>
+ <name>mapreduce.output.fileoutputformat.compress.codec</name>
<value>org.apache.hadoop.io.compress.DefaultCodec</value>
<description>If the job outputs are compressed, how should they be
compressed?
</description>
