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
This commit is contained in:
Alejandro Abdelnur 2011-12-14 01:21:15 +00:00
parent 88fe1ae2ed
commit 9a6d5e328e
3 changed files with 7 additions and 0 deletions

View File

@ -234,6 +234,9 @@ Release 0.23.1 - Unreleased
in the correct directory to work properly in secure mode. (Hitesh Shah via in the correct directory to work properly in secure mode. (Hitesh Shah via
vinodkv) vinodkv)
MAPREDUCE-3544. gridmix build is broken, requires hadoop-archives to be
added as ivy dependency. (tucu)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -68,6 +68,8 @@
rev="${yarn.version}" conf="test->default"> rev="${yarn.version}" conf="test->default">
<artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/> <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/>
</dependency> </dependency>
<dependency org="org.apache.hadoop" name="hadoop-archives"
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="commons-logging" <dependency org="commons-logging"
name="commons-logging" name="commons-logging"
rev="${commons-logging.version}" rev="${commons-logging.version}"

View File

@ -61,6 +61,8 @@
rev="${yarn.version}" conf="common->default"/> rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common" <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
rev="${yarn.version}" conf="common->default"/> 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" <dependency org="commons-logging"
name="commons-logging" name="commons-logging"