From d9420f3c488afe3dc1e3f504ad2e351ddce961db Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 1 Jun 2012 21:42:58 +0000
Subject: [PATCH] Merge -r 1345357:1345358 from trunk to branch. FIXES:
 HADOOP-8466

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

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index b3abf42c99c..91227a7fbbf 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -107,10 +107,6 @@
           <groupId>org.aspectj</groupId>
           <artifactId>aspectjrt</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.avro</groupId>
-          <artifactId>avro</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.avro</groupId>
           <artifactId>avro-ipc</artifactId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7b6dbc423cf..8f7315f1ba6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -62,6 +62,8 @@ Release 2.0.1-alpha - UNRELEASED
     HADOOP-8460. Document proper setting of HADOOP_PID_DIR and 
     HADOOP_SECURE_DN_PID_DIR (bobby)
 
+    HADOOP-8466. hadoop-client POM incorrectly excludes avro. (bmahe via tucu)
+
 Release 2.0.0-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES