Author: tucu
Date: Wed Dec 14 17:24:18 2011
New Revision: 1214358
URL: http://svn.apache.org/viewvc?rev=1214358&view=rev
Log:
Merge -r 1214353:1214354 from trunk to branch. FIXES: MAPREDUCE-3557
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/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=1214358&r1=1214357&r2=1214358&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 17:24:18 2011
@@ -239,6 +239,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3544. gridmix build is broken, requires hadoop-archives to be
added as ivy dependency. (tucu)
+ MAPREDUCE-3557. MR1 test fail to compile because of missing
hadoop-archives
+ dependency. (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml?rev=1214358&r1=1214357&r2=1214358&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/ivy.xml Wed Dec
14 17:24:18 2011
@@ -99,6 +99,8 @@
rev="${yarn.version}" conf="compile->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="compile->default"/>
<dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
conf="checkstyle->default"/>
