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:
parent
0bed0fec3c
commit
d9420f3c48
|
@ -107,10 +107,6 @@
|
|||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjrt</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.apache.avro</groupId>
|
||||
<artifactId>avro-ipc</artifactId>
|
||||
|
|
|
@ -62,6 +62,8 @@ Release 2.0.1-alpha - UNRELEASED
|
|||
HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
|
||||
HADOOP_SECURE_DN_PID_DIR (bobby)
|
||||
|
||||
HADOOP-8466. hadoop-client POM incorrectly excludes avro. (bmahe via tucu)
|
||||
|
||||
Release 2.0.0-alpha - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
Loading…
Reference in New Issue