From 9a6d5e328e5d817b879cb93d51d4a145aecded2e Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Wed, 14 Dec 2011 01:21:15 +0000
Subject: [PATCH] Merge -r 1214016:1214017 from trunk to branch. FIXES:
 MAPREDUCE-3544

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214019 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                 | 3 +++
 hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml | 2 ++
 hadoop-mapreduce-project/src/contrib/raid/ivy.xml    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b154c79ecf9..973402d8d6a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -234,6 +234,9 @@ Release 0.23.1 - Unreleased
     in the correct directory to work properly in secure mode. (Hitesh Shah via
     vinodkv)
 
+    MAPREDUCE-3544. gridmix build is broken, requires hadoop-archives to be 
+    added as ivy dependency. (tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml b/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
index af4e945143c..4ab7b620659 100644
--- a/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
+++ b/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
@@ -68,6 +68,8 @@
                rev="${yarn.version}" conf="test->default">
      <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
    </dependency>
+   <dependency org="org.apache.hadoop" name="hadoop-archives" 
+               rev="${hadoop-common.version}" conf="common->default"/> 
    <dependency org="commons-logging"
       name="commons-logging"
       rev="${commons-logging.version}"
diff --git a/hadoop-mapreduce-project/src/contrib/raid/ivy.xml b/hadoop-mapreduce-project/src/contrib/raid/ivy.xml
index f452c9fbdb6..55ea7aa1a2e 100644
--- a/hadoop-mapreduce-project/src/contrib/raid/ivy.xml
+++ b/hadoop-mapreduce-project/src/contrib/raid/ivy.xml
@@ -61,6 +61,8 @@
                rev="${yarn.version}" conf="common->default"/>
    <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
                rev="${yarn.version}" conf="common->default"/>
+   <dependency org="org.apache.hadoop" name="hadoop-archives" 
+               rev="${hadoop-common.version}" conf="common->default"/> 
 
     <dependency org="commons-logging"
       name="commons-logging"