HADOOP-3934. Merge from trunk down into branch 0.18. Also included half of the

change for HADOOP-4037 relevant to the log4j jar name.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@693595 13f79535-47bb-0310-9956-ffa450edef68

.eclipse.templates/.classpath

@@ -27,7 +27,7 @@
 	<classpathentry kind="lib" path="lib/jetty-ext/jsp-api.jar"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/kfs-0.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.4.3.jar"/>

CHANGES.txt

@@ -2,6 +2,10 @@ Hadoop Change Log
 
 Release 0.18.1 - Unreleased
 
+  IMPROVEMENTS
+
+    HADOOP-3934. Upgrade log4j to 1.2.15. (omalley)
+
   BUG FIXES
 
     HADOOP-3995. In case of quota failure on HDFS, rename does not restore