Author: eli
Date: Sun Nov 28 21:35:53 2010
New Revision: 1039954
URL: http://svn.apache.org/viewvc?rev=1039954&view=rev
Log:
HADOOP-7052. svn merge -c 1039952 from trunk
Modified:
hadoop/common/branches/branch-0.22/ (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.22/conf/log4j.properties
hadoop/common/branches/branch-0.22/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.22/src/docs/ (props changed)
hadoop/common/branches/branch-0.22/src/java/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
(props changed)
Propchange: hadoop/common/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901
+/hadoop/common/trunk:1037901,1039952
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1039954&r1=1039953&r2=1039954&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Sun Nov 28 21:35:53 2010
@@ -367,6 +367,9 @@ Release 0.21.1 - Unreleased
HADOOP-6954. Sources JARs are not correctly published to the Maven
repository. (tomwhite)
+ HADOOP-7052. misspelling of threshold in conf/log4j.properties.
+ (Jingguo Yao via eli)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901
+/hadoop/common/trunk/CHANGES.txt:1037901,1039952
/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.22/conf/log4j.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/conf/log4j.properties?rev=1039954&r1=1039953&r2=1039954&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/conf/log4j.properties (original)
+++ hadoop/common/branches/branch-0.22/conf/log4j.properties Sun Nov 28
21:35:53 2010
@@ -17,7 +17,7 @@ hadoop.mapreduce.jobsummary.log.file=had
log4j.rootLogger=${hadoop.root.logger}, EventCounter
# Logging Threshold
-log4j.threshhold=ALL
+log4j.threshold=ALL
#
# Daily Rolling File Appender
Propchange: hadoop/common/branches/branch-0.22/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:1037901
+/hadoop/common/trunk/src/contrib/ec2:1037901,1039952
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.22/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901
+/hadoop/common/trunk/src/docs:1037901,1039952
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901
+/hadoop/common/trunk/src/java:1037901,1039952
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901
+/hadoop/common/trunk/src/test/core:1037901,1039952
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange:
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 21:35:53 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643
