svn merge -c 1512314 from trunk to branch-2 to fix HADOOP-9672.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512315 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-08-09 14:15:30 +00:00
parent 3820a0701d
commit d90f3fbdbf
2 changed files with 3 additions and 1 deletions

View File

@ -63,6 +63,8 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel)
HADOOP-9672. Upgrade Avro dependency to 1.7.4. (sandy via kihwal)
OPTIMIZATIONS
BUG FIXES

View File

@ -592,7 +592,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
<version>1.7.4</version>
</dependency>
<dependency>
<groupId>net.sf.kosmosfs</groupId>