HDFS-2649. svn merge -c 1214046 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214049 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2011-12-14 03:57:21 +00:00
parent eb0ecec0c5
commit 71ce4a9c6a
2 changed files with 11 additions and 1 deletions

View File

@ -269,6 +269,13 @@
</resources> </resources>
<plugins> <plugins>
<plugin>
<!-- workaround for filtered/unfiltered resources in same directory -->
<!-- remove when maven-eclipse-plugin 2.9 is available -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

View File

@ -95,7 +95,10 @@ Release 0.23.1 - UNRELEASED
HDFS-2653. DFSClient should cache whether addrs are non-local when HDFS-2653. DFSClient should cache whether addrs are non-local when
short-circuiting is enabled. (eli) short-circuiting is enabled. (eli)
HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs.
(Jason Lowe via eli)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES