HADOOP-7052. svn merge -c 1039952 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@1039953 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -27,6 +27,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

conf/log4j.properties

@@ -17,7 +17,7 @@ hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
 log4j.rootLogger=${hadoop.root.logger}, EventCounter
 
 # Logging Threshold
-log4j.threshhold=ALL
+log4j.threshold=ALL
 
 #
 # Daily Rolling File Appender