Return-Path: 
 <core-commits-return-5929-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 77059 invoked from network); 9 Sep 2008 20:34:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Sep 2008 20:34:09 -0000
Received: (qmail 94683 invoked by uid 500); 9 Sep 2008 20:34:06 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 94663 invoked by uid 500); 9 Sep 2008 20:34:06 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 94654 invoked by uid 99); 9 Sep 2008 20:34:06 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 13:34:06 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 20:33:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 456212388986; Tue,  9 Sep 2008 13:33:48 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r693595 - in /hadoop/core/branches/branch-0.18:
 .eclipse.templates/.classpath CHANGES.txt lib/log4j-1.2.13.jar
 lib/log4j-1.2.15.jar
Date: Tue, 09 Sep 2008 20:33:48 -0000
To: core-commits@hadoop.apache.org
From: omalley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080909203348.456212388986@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: omalley
Date: Tue Sep  9 13:33:47 2008
New Revision: 693595

URL: http://svn.apache.org/viewvc?rev=693595&view=rev
Log:
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.

Added:
    hadoop/core/branches/branch-0.18/lib/log4j-1.2.15.jar
      - copied unchanged from r686882, hadoop/core/trunk/lib/log4j-1.2.15.jar
Removed:
    hadoop/core/branches/branch-0.18/lib/log4j-1.2.13.jar
Modified:
    hadoop/core/branches/branch-0.18/.eclipse.templates/.classpath
    hadoop/core/branches/branch-0.18/CHANGES.txt

Modified: hadoop/core/branches/branch-0.18/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/.eclipse.templates/.classpath?rev=693595&r1=693594&r2=693595&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/.eclipse.templates/.classpath (original)
+++ hadoop/core/branches/branch-0.18/.eclipse.templates/.classpath Tue Sep  9 13:33:47 2008
@@ -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"/>

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=693595&r1=693594&r2=693595&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Tue Sep  9 13:33:47 2008
@@ -2,6 +2,10 @@
 
 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