diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 99552d9d785..133e8fa07c2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -197,6 +197,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 68be3f8d42f..797c4064e0a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -513,7 +513,7 @@ commons-logging commons-logging - 1.1.1 + 1.1.3 avalon-framework