From afc35c31ea3e12fba0a9ee78a8160abfc4fd3a70 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Mon, 5 Mar 2012 23:12:46 +0000
Subject: [PATCH] Merge -r 1297269:1297270 from trunk to branch. FIXES:
 HADOOP-8125

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

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index df46b3a5410..0cdc151e508 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -17,9 +17,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.hadoop</groupId>
-    <artifactId>hadoop-project</artifactId>
+    <artifactId>hadoop-project-dist</artifactId>
     <version>0.23.3-SNAPSHOT</version>
-    <relativePath>../hadoop-project</relativePath>
+    <relativePath>../hadoop-project-dist</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-client</artifactId>
@@ -29,6 +29,10 @@
   <description>Apache Hadoop Client</description>
   <name>Apache Hadoop Client</name>
 
+<properties>
+   <hadoop.component>client</hadoop.component>
+ </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 269fcb688c2..22249220a37 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -65,6 +65,9 @@ Release 0.23.3 - UNRELEASED
     HADOOP-7994. Remove getProtocolVersion and getProtocolSignature from the
     client side translator and server side implementation. (jitendra)
 
+    HADOOP-8125. make hadoop-client set of curated jars available in a
+    distribution tarball (rvs via tucu)
+
   OPTIMIZATIONS
 
   BUG FIXES