Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1345357:1345358 from trunk to branch. FIXES: HADOOP-8466 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-06-01 21:42:58 +00:00
parent 0bed0fec3c
commit d9420f3c48
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-client/pom.xml
View File

@ -107,10 +107,6 @@
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId> <artifactId>aspectjrt</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId> <artifactId>avro-ipc</artifactId>

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -62,6 +62,8 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8460. Document proper setting of HADOOP_PID_DIR and HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
HADOOP_SECURE_DN_PID_DIR (bobby) HADOOP_SECURE_DN_PID_DIR (bobby)
HADOOP-8466. hadoop-client POM incorrectly excludes avro. (bmahe via tucu)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES