From 3ddf8319ca974c65f2605a97532bdb9516367029 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Thu, 11 Apr 2013 04:05:29 +0000
Subject: [PATCH] HADOOP-9471. hadoop-client wrongfully excludes jetty-util
 JAR, breaking webhdfs. (tucu)

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

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index 5d8c7fad4d6..8dea4325899 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -143,10 +143,6 @@
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jetty</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-core</artifactId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 6651d6d0640..480e7f8f39d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -617,6 +617,9 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9429. TestConfiguration fails with IBM JAVA. (Amir Sanjar via
     suresh)
 
+    HADOOP-9471. hadoop-client wrongfully excludes jetty-util JAR, 
+    breaking webhdfs. (tucu)
+
 Release 2.0.4-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES