You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tu...@apache.org on 2011/12/14 02:21:15 UTC
svn commit: r1214019 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
src/contrib/gridmix/ivy.xml src/contrib/raid/ivy.xml
Author: tucu
Date: Wed Dec 14 01:21:15 2011
New Revision: 1214019
URL: http://svn.apache.org/viewvc?rev=1214019&view=rev
Log:
Merge -r 1214016:1214017 from trunk to branch. FIXES: MAPREDUCE-3544
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/raid/ivy.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1214019&r1=1214018&r2=1214019&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed Dec 14 01:21:15 2011
@@ -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
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml?rev=1214019&r1=1214018&r2=1214019&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml Wed Dec 14 01:21:15 2011
@@ -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}"
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/raid/ivy.xml?rev=1214019&r1=1214018&r2=1214019&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/raid/ivy.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/raid/ivy.xml Wed Dec 14 01:21:15 2011
@@ -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"