HADOOP-9557. Merging change r1523186 from branch-2 to branch-2.1-beta

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1523187 13f79535-47bb-0310-9956-ffa450edef68

hadoop-client/pom.xml

@@ -39,10 +39,6 @@
       <artifactId>hadoop-common</artifactId>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>tomcat</groupId>
           <artifactId>jasper-compiler</artifactId>

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -111,6 +111,9 @@ Release 2.1.1-beta - UNRELEASED
 
     HADOOP-9960. Upgrade Jersey version to 1.9. (Karthik Kambatla via atm)
 
+    HADOOP-9557. hadoop-client excludes commons-httpclient. (Lohit Vijayarenu via
+    cnauroth)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES