From 75d882ba00080cf2d416ac5f7ebbdeace2ee9f05 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Thu, 2 Jan 2014 13:39:37 +0000
Subject: [PATCH] HADOOP-10147 HDFS-5678 Upgrade to commons-logging 1.1.3 to
 avoid potential deadlock in MiniDFSCluster

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554803 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-project/pom.xml                          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 11b567e698..ee6ee6ddb5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -489,6 +489,9 @@ Release 2.4.0 - UNRELEASED
 
     HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai via jeagles)
 
+    HADOOP-10147  HDFS-5678 Upgrade to commons-logging 1.1.3 to avoid potential
+    deadlock in MiniDFSCluster (stevel)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index b296a294e2..e1ff1eba5b 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -519,7 +519,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.3</version>
         <exclusions>
           <exclusion>
             <groupId>avalon-framework</groupId>